diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-07-15 01:56:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-15 00:22:01 +0000 |
| commit | 04b550e27a6fb22bf967be43f6e2b741e9ddd67c (patch) | |
| tree | 899d80fd1cfd32bfdc34b6db42f5129d90170435 /src/com/android | |
| parent | 6c5ef39135e095330ace69154420b0637be0f789 (diff) | |
| parent | 3033ce0723103b55b1b5a53145c05e143b5bbfd6 (diff) | |
| download | packages_apps_Settings-04b550e27a6fb22bf967be43f6e2b741e9ddd67c.tar.gz packages_apps_Settings-04b550e27a6fb22bf967be43f6e2b741e9ddd67c.tar.bz2 packages_apps_Settings-04b550e27a6fb22bf967be43f6e2b741e9ddd67c.zip | |
Merge "Handle android.settings.HOME_SETTINGS intent" into lmp-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 1 |
2 files changed, 2 insertions, 0 deletions
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(), |