Merge pull request #1938 from tonymanou/settings_activity

Changed settings dialog to an activity
M66B · Aug 30, 2014 · 3aad666 · 3aad666
2 parents 4deac63 + 79bc42e
commit 3aad666
Show file tree

Hide file tree

Showing 8 changed files with 1,315 additions and 1,269 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -121,6 +121,22 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ActivitySettings"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:parentActivityName=".ActivityMain"
+            android:windowSoftInputMode="stateHidden" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="biz.bokhorst.xprivacy.ActivityMain" />
+
+            <intent-filter>
+                <action android:name="biz.bokhorst.xprivacy.action.SETTINGS" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ActivityUsage"
             android:configChanges="keyboardHidden|orientation|screenSize"