diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-13 13:54:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:07:30 +0000 |
| commit | 20a2aaa9595e9ab958d27eb430af6560e24ba78c (patch) | |
| tree | d810cc69bfa5db15a0d8833cfc73a4618a0eee73 /src/com/android/settings/Settings.java | |
| parent | f0ad93f3b99b9fd7c5191dc9fa91c59809d48870 (diff) | |
| parent | 29a4eb7a33da12a957b3305138ada69140d8ab75 (diff) | |
| download | packages_apps_Settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.gz packages_apps_Settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.bz2 packages_apps_Settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.zip | |
Merge commit 'android-4.2.2_r1' into mr1.1-staging
Conflicts:
AndroidManifest.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fi/strings.xml
res/values-hu/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/strings.xml
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/ChooseLockPatternTutorial.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/Settings.java
Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 80f8468e5..935097d30 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -399,7 +399,11 @@ public class Settings extends PreferenceActivity VpnSettings.class.getName().equals(fragmentName) || SecuritySettings.class.getName().equals(fragmentName) || InstalledAppDetails.class.getName().equals(fragmentName) || - ChooseLockGenericFragment.class.getName().equals(fragmentName)) { + ChooseLockGenericFragment.class.getName().equals(fragmentName) || + TetherSettings.class.getName().equals(fragmentName) || + ApnSettings.class.getName().equals(fragmentName) || + LocationSettings.class.getName().equals(fragmentName) || + ZonePicker.class.getName().equals(fragmentName)) { intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true); } @@ -872,4 +876,5 @@ public class Settings extends PreferenceActivity public static class ApnEditorActivity extends Settings { /* empty */ } public static class ProfilesSettingsActivity extends Settings { /* empty */ } public static class QuietHoursSettingsActivity extends Settings { /* empty */ } + public static class DreamSettingsActivity extends Settings { /* empty */ } } |