X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2FAndroidManifest.xml;h=5c5adf6e5e80b07b89d0b13fa36dd6cf6c7acef0;hb=218e03269d47ababa71ae0dcec7b6ea8fef20454;hp=61a4c6f209724dbd96c7f9f8a2b65ece45e6edc4;hpb=dcc9119811a9eed34df55da205c55c3092c262a4;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61a4c6f2..5c5adf6e 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 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
 
@@ -33,11 +33,11 @@
         android:label="@string/privacy_browser"
         android:theme="@style/AppTheme" >
 
-        <!-- android:configChanges="orientation|screenSize" makes the app not reload when the orientation changes. -->
+        <!-- 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. -->
         <activity
-            android:name=".Webview"
+            android:name=".MainWebView"
             android:configChanges="orientation|screenSize"
             android:label="@string/privacy_browser"
             android:launchMode="singleTask">
@@ -47,7 +47,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <!-- android.intent.action.VIEW with the two 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" />
@@ -56,6 +56,18 @@
                 <data android:scheme="https" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".Settings"
+            android:label="@string/privacy_browser_settings"
+            android:parentActivityName=".MainWebView" >
+
+            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainWebView" />
+        </activity>
+
     </application>
 
 </manifest>