X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2FAndroidManifest.xml;h=8f6a8a50839ac19e5fb9a9d55fcbba8e79e41d85;hb=c040f68d2825cd08a2e236f2cc272536d54ebc9c;hp=2d572fa7a49d6111e55860f24d6d32ae2bf36965;hpb=30199e211f320d781774a8cfa683317c71635871;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d572fa7..8f6a8a50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -25,9 +25,12 @@
     <!-- Required to load websites. -->
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <!-- Required to create homescreen shortcuts. -->
+    <!-- Required to create home screen shortcuts. -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
+    <!-- Required to save files to the public download folder. -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
 
     <!-- Support Chromebooks that don't have a touch screen. -->
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
@@ -37,7 +40,7 @@
     <application
         android:label="@string/privacy_browser"
         android:icon="@mipmap/privacy_browser"
-        android:theme="@style/PrivacyBrowser"
+        android:roundIcon="@mipmap/privacy_browser_round"
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:supportsRtl="true" >
@@ -47,14 +50,21 @@
             android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true" />
 
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity 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.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+        <!-- Explicitly disable "Safe Browsing". -->
+        <meta-data
+            android:name="android.webkit.WebView.EnableSafeBrowsing"
+            android:value="false" />
+
+        <!-- The theme has to be defined here or an ugly title bar is displayed when the app launches.
+             `android:configChanges="orientation|screenSize"` makes the activity 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 recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.MainWebViewActivity"
             android:label="@string/privacy_browser"
+            android:theme="@style/PrivacyBrowserLight"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTask"
             android:screenOrientation="fullUser"
@@ -78,12 +88,11 @@
 
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.BookmarksActivity"
             android:label="@string/bookmarks"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
@@ -91,12 +100,11 @@
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.BookmarksDatabaseViewActivity"
             android:label="@string/bookmarks_database_view"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
             android:parentActivityName=".activities.BookmarksActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
@@ -104,51 +112,47 @@
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/privacy_browser_settings"
-            android:theme="@style/Settings"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+        <!-- `android:windowSoftInputMode="stateAlwaysHidden"` keeps the keyboard from displaying when the screen is rotated and after the `AddDomainDialog` is dismissed.
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
             android:name=".activities.DomainsActivity"
             android:label="@string/domains"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:screenOrientation="fullUser"
+            android:windowSoftInputMode="stateAlwaysHidden"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21.
-             `android:windowSoftInputMode="stateAlwaysHidden"` removes the keyboard from the screen, which is displayed because `ScrollViews` always focus the first `EditText` despite being told not to. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
-            android:name=".activities.DomainSettingsActivity"
-            android:label="@string/domain_settings"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
-            android:parentActivityName=".activities.DomainsActivity"
+            android:name=".activities.GuideActivity"
+            android:label="@string/privacy_browser_guide"
+            android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
-            android:windowSoftInputMode="stateAlwaysHidden"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
-            android:name=".activities.GuideActivity"
-            android:label="@string/privacy_browser_guide"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
+            android:name=".activities.AboutActivity"
+            android:label="@string/about_privacy_browser"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
@@ -156,12 +160,11 @@
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+             `android:persistableMode="persistNever"` removes Privacy Browser from the recent apps list on a device reboot.
+             `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
-            android:name=".activities.AboutActivity"
-            android:label="@string/about_privacy_browser"
-            android:theme="@style/PrivacyBrowser.SecondaryActivity"
+            android:name=".activities.ViewSourceActivity"
+            android:label="@string/view_source"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"