Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Changed settings dialog to an activity #1938

Merged
merged 14 commits into from
Aug 30, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading