diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-03-13 15:52:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-13 15:52:36 +0000 |
| commit | 66f1543690fbda646f413ff20256ba75ae6ac996 (patch) | |
| tree | 5b5e6ce11bf80ea4220e7c90c6f2f523d77f9c55 /src | |
| parent | 61743f22104911dc7f8b4575f2fbc93f3796ef85 (diff) | |
| parent | 77dab4be6486c4ffa2d2b2a8660a57510533c565 (diff) | |
| download | packages_apps_Settings-66f1543690fbda646f413ff20256ba75ae6ac996.zip packages_apps_Settings-66f1543690fbda646f413ff20256ba75ae6ac996.tar.gz packages_apps_Settings-66f1543690fbda646f413ff20256ba75ae6ac996.tar.bz2 | |
Merge "Remove multi-window developer setting from search index if disabled."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index a4002ab..b5b33f4 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -728,7 +728,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals(""); } - private boolean showEnableMultiWindowPreference() { + private static boolean showEnableMultiWindowPreference() { return !"user".equals(Build.TYPE); } @@ -1781,6 +1781,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment if (!showEnableOemUnlockPreference()) { keys.add(ENABLE_OEM_UNLOCK); } + if (!showEnableMultiWindowPreference()) { + keys.add(ENABLE_MULTI_WINDOW_KEY); + } return keys; } }; |