X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2FAndroidManifest.xml;h=17fb93abbc0c2bacfcb9bd30bbe9110b1070aac2;hb=81931a2a88e383f1071ab5134afe5bd70b31895d;hp=6c83697d3b91c15421eab339026061e4d93a7a39;hpb=44014ce1673cb4cbfcdaeceac59c067a5074b35c;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c83697d..17fb93ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
     <!-- Required to create homescreen shortcuts. -->
     <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. -->
     <application
         android:label="@string/privacy_browser"
@@ -35,6 +36,12 @@
         android:allowBackup="false"
         android:fullBackupContent="false" >
 
+        <!-- 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.
@@ -42,7 +49,6 @@
         <activity
             android:name=".MainWebViewActivity"
             android:label="@string/privacy_browser"
-            android:theme="@style/PrivacyBrowser.MainWebView"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleTask"
             android:persistableMode="persistNever" >
@@ -62,20 +68,38 @@
             </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. -->
+        <activity
+            android:name=".BookmarksActivity"
+            android:label="@string/bookmarks"
+            android:theme="@style/PrivacyBrowser.SecondaryActivity"
+            android:parentActivityName=".MainWebViewActivity"
+            android:configChanges="orientation|screenSize"
+            android:persistableMode="persistNever" >
+        </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. -->
         <activity
             android:name=".SettingsActivity"
             android:label="@string/privacy_browser_settings"
-            android:theme="@style/PrivacyBrowser.Settings"
+            android:theme="@style/Settings"
             android:parentActivityName=".MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:persistableMode="persistNever" >
+        </activity>
 
-            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainWebViewActivity" />
+        <!-- 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. -->
+        <activity
+            android:name=".GuideActivity"
+            android:label="@string/privacy_browser_guide"
+            android:theme="@style/PrivacyBrowser.SecondaryActivity"
+            android:parentActivityName=".MainWebViewActivity"
+            android:configChanges="orientation|screenSize"
+            android:persistableMode="persistNever" >
         </activity>
 
         <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes.
@@ -83,17 +107,10 @@
         <activity
             android:name=".AboutActivity"
             android:label="@string/about_privacy_browser"
-            android:theme="@style/PrivacyBrowser.About"
+            android:theme="@style/PrivacyBrowser.SecondaryActivity"
             android:parentActivityName=".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>
-
     </application>
-
 </manifest>