summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-05-02 10:54:12 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-05-02 12:00:51 -0700
commit745bad9da1ef2fca2ab7bfeb5ea885a2b50c49c3 (patch)
tree9e65a1a6ee1a500fc5e1dc36e1561338ea69a0ec /AndroidManifest.xml
parentf8a2ba27078badc61b7122a6781214a4148a686f (diff)
downloadandroid_packages_apps_Trebuchet-745bad9da1ef2fca2ab7bfeb5ea885a2b50c49c3.tar.gz
android_packages_apps_Trebuchet-745bad9da1ef2fca2ab7bfeb5ea885a2b50c49c3.tar.bz2
android_packages_apps_Trebuchet-745bad9da1ef2fca2ab7bfeb5ea885a2b50c49c3.zip
Chaning the behavior of settings activity.
> Making all twoState prefs backed by content provider > Using the stadard intent defined in N for settings > Using SharedPrefsListener instead of LauncherProvider Change-Id: I8272f54aa780bc0436e3d0aa89096a4bd2a9194f
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ae311ea3..e7b703cab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,8 +85,11 @@
<activity
android:name="com.android.launcher3.SettingsActivity"
android:label="@string/settings_button_text"
- android:autoRemoveFromRecents="true"
- android:process=":settings_process">
+ android:autoRemoveFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<!-- Intent received used to install shortcuts from other applications -->