Update icons. Release 1.0.

[PrivacyBrowserAndroid.git] / app / src / main / AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c5adf6e5e80b07b89d0b13fa36dd6cf6c7acef0..379bc3c86807f9d0aa41cd6dae3df32477a2cee5 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,26 +21,34 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stoutner.privacybrowser" >
 
+    <!-- Required to load websites. -->
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Required to create homescreen shortcuts. -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
+    <!-- Required to upload files to websites. -->
+    <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
+
+    <!-- on API >= 23, app data is automatically backed up to Google cloud servers unless android:allowBackup="false" and android:fullBackupContent="false" is set. -->
     <application
-        android:allowBackup="false"
-        android:fullBackupContent="false"
-        android:icon="@mipmap/ic_launcher"
         android:label="@string/privacy_browser"
-        android:theme="@style/AppTheme" >
+        android:icon="@mipmap/privacy_browser"
+        android:theme="@style/AppTheme"
+        android:allowBackup="false"
+        android:fullBackupContent="false" >
 
         <!-- android:configChanges="orientation|screenSize" makes the app not reload when the orientation changes, which preserves scroll location in the WebView. -->
         <!-- android:launchMode="singleTask" makes the app launch in a new task instead of inside the task of the program that sends it an intent.
             It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one. -->
+        <!-- android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
         <activity
-            android:name=".MainWebView"
-            android:configChanges="orientation|screenSize"
+            android:name=".MainWebViewActivity"
             android:label="@string/privacy_browser"
-            android:launchMode="singleTask">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
+            android:launchMode="singleTask"
+            android:persistableMode="persistNever" >
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -57,15 +65,17 @@
             </intent-filter>
         </activity>
 
+        <!-- android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
         <activity
-            android:name=".Settings"
+            android:name=".SettingsActivity"
             android:label="@string/privacy_browser_settings"
-            android:parentActivityName=".MainWebView" >
+            android:parentActivityName=".MainWebViewActivity"
+            android:persistableMode="persistNever" >
 
             <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainWebView" />
+                android:value=".MainWebViewActivity" />
         </activity>
 
     </application>