X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2FAndroidManifest.xml;h=be16084ba18ef49814ccc73697357d451fdf8cb4;hb=922fa1656fdc20242c266346ea30d4c2e9489eb9;hp=fa62965ded33161075dfd543986936d8a24ef113;hpb=a44d1cbf2fdd6e460d88adcae1b84bff1802813f;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fa62965d..be16084b 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-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -19,7 +19,8 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.stoutner.privacybrowser" >
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.stoutner.privacybrowser" >
 
     <!-- Required to load websites. -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -28,38 +29,45 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
 
-    <!-- For API >= 23, app data is automatically backed up to Google cloud servers unless android:allowBackup="false" and android:fullBackupContent="false" is set. -->
+    <!-- Support Chromebooks that don't have a touch screen. -->
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+
+    <!-- For API >= 23, app data is automatically backed up to Google cloud servers unless `android:allowBackup="false"` and `android:fullBackupContent="false"` is set. -->
     <application
         android:label="@string/privacy_browser"
         android:icon="@mipmap/privacy_browser"
-        android:theme="@style/PrivacyBrowser"
         android:allowBackup="false"
-        android:fullBackupContent="false" >
+        android:fullBackupContent="false"
+        android:supportsRtl="true" >
 
-        <!-- If android:name="android.webkit.WebView.MetricsOptOut" is not "true" then WebViews will upload metrics to Google.
-          https://developer.android.com/reference/android/webkit/WebView.html -->
+        <!-- If `android:name="android.webkit.WebView.MetricsOptOut"` is not `true` then `WebViews` will upload metrics to Google.  <https://developer.android.com/reference/android/webkit/WebView.html> -->
         <meta-data
             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. -->
+        <!-- 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 recents screen on a device reboot.
+            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
         <activity
-            android:name=".MainWebViewActivity"
+            android:name=".activities.MainWebViewActivity"
             android:label="@string/privacy_browser"
-            android:theme="@style/PrivacyBrowser.MainWebView"
+            android:theme="@style/PrivacyBrowserLight"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTask"
-            android:persistableMode="persistNever" >
+            android:screenOrientation="fullUser"
+            android:persistableMode="persistNever"
+            tools:ignore="UnusedAttribute" >
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <!-- android.intent.action.VIEW with the two data schemes enables processing of web intents. -->
+            <!-- `android.intent.action.VIEW` with the two data schemes enables processing of web intents. -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -69,54 +77,89 @@
             </intent-filter>
         </activity>
 
-        <!-- 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. -->
+
+        <!-- `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. -->
         <activity
-            android:name=".GuideActivity"
-            android:label="@string/privacy_browser_guide"
-            android:theme="@style/PrivacyBrowser.TabActivity"
-            android:parentActivityName=".MainWebViewActivity"
+            android:name=".activities.BookmarksActivity"
+            android:label="@string/bookmarks"
+            android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
-            android:persistableMode="persistNever" >
+            android:screenOrientation="fullUser"
+            android:persistableMode="persistNever"
+            tools:ignore="UnusedAttribute" />
 
-            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainWebViewActivity" />
-        </activity>
+        <!-- `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. -->
+        <activity
+            android:name=".activities.BookmarksDatabaseViewActivity"
+            android:label="@string/bookmarks_database_view"
+            android:parentActivityName=".activities.BookmarksActivity"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="fullUser"
+            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. -->
+        <!-- `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. -->
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:label="@string/privacy_browser_settings"
-            android:theme="@style/PrivacyBrowser.Settings"
-            android:parentActivityName=".MainWebViewActivity"
+            android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
-            android:persistableMode="persistNever" >
+            android:screenOrientation="fullUser"
+            android:persistableMode="persistNever"
+            tools:ignore="UnusedAttribute" />
 
-            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainWebViewActivity" />
-        </activity>
+        <!-- `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. -->
+        <activity
+            android:name=".activities.DomainsActivity"
+            android:label="@string/domains"
+            android:parentActivityName=".activities.MainWebViewActivity"
+            android:screenOrientation="fullUser"
+            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. -->
+        <activity
+            android:name=".activities.DomainSettingsActivity"
+            android:label="@string/domain_settings"
+            android:parentActivityName=".activities.DomainsActivity"
+            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. -->
+        <activity
+            android:name=".activities.GuideActivity"
+            android:label="@string/privacy_browser_guide"
+            android:parentActivityName=".activities.MainWebViewActivity"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="fullUser"
+            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. -->
+        <!-- `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. -->
         <activity
-            android:name=".AboutActivity"
+            android:name=".activities.AboutActivity"
             android:label="@string/about_privacy_browser"
-            android:theme="@style/PrivacyBrowser.TabActivity"
-            android:parentActivityName=".MainWebViewActivity"
+            android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
-            android:persistableMode="persistNever" >
-
-            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainWebViewActivity" />
-        </activity>
-
+            android:screenOrientation="fullUser"
+            android:persistableMode="persistNever"
+            tools:ignore="UnusedAttribute" />
     </application>
-
 </manifest>