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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 66fc9a55..5c5adf6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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>