diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-07-14 18:03:15 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-07-14 18:03:15 -0700 |
| commit | 3033ce0723103b55b1b5a53145c05e143b5bbfd6 (patch) | |
| tree | 1e33ce807a8c51885af00be80d9e4b847937d9a4 | |
| parent | cfc7f9d9600f7b4514ce9608314874bf1023eb21 (diff) | |
| download | packages_apps_Settings-3033ce0723103b55b1b5a53145c05e143b5bbfd6.tar.gz packages_apps_Settings-3033ce0723103b55b1b5a53145c05e143b5bbfd6.tar.bz2 packages_apps_Settings-3033ce0723103b55b1b5a53145c05e143b5bbfd6.zip | |
Handle android.settings.HOME_SETTINGS intent
Launch the Home picker activity for the new public intent.
Bug: 16303152
Change-Id: I91cfffdec6c8ed13d3b0e57d7903b4a06dcbb6e6
| -rw-r--r-- | AndroidManifest.xml | 15 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 55736f4a7..11ae5820b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -553,6 +553,21 @@ android:resource="@id/notification_settings" /> </activity> + <activity android:name="Settings$HomeSettingsActivity" + android:label="@string/home_settings" + android:taskAffinity=""> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.settings.HOME_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + </intent-filter> + <meta-data android:name="com.android.settings.FRAGMENT_CLASS" + android:value="com.android.settings.HomeSettings" /> + <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" + android:resource="@id/home_settings" /> + </activity> + <activity android:name="Settings$DisplaySettingsActivity" android:label="@string/display_settings" android:taskAffinity=""> diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index ada1b0daf..895e9eaab 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -40,6 +40,7 @@ public class Settings extends SettingsActivity { public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ } public static class LocalePickerActivity extends SettingsActivity { /* empty */ } public static class UserDictionarySettingsActivity extends SettingsActivity { /* empty */ } + public static class HomeSettingsActivity extends SettingsActivity { /* empty */ } public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ } public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ } public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index e2aeaf2d3..087540bc1 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -239,6 +239,7 @@ public class SettingsActivity extends Activity SpellCheckersSettings.class.getName(), UserDictionaryList.class.getName(), UserDictionarySettings.class.getName(), + HomeSettings.class.getName(), DisplaySettings.class.getName(), DeviceInfoSettings.class.getName(), ManageApplications.class.getName(), |