PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove multi-window developer setting from search index if disabled."

Browse Source
This commit is contained in:
Wale Ogunwale
2015-03-13 15:52:35 +00:00
committed by Android (Google) Code Review
parent 61743f2210 77dab4be64
commit 66f1543690
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/DevelopmentSettings.java
View File

@@ -728,7 +728,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals(""); return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
} }
private boolean showEnableMultiWindowPreference() { private static boolean showEnableMultiWindowPreference() {
return !"user".equals(Build.TYPE); return !"user".equals(Build.TYPE);
} }
@@ -1781,6 +1781,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
if (!showEnableOemUnlockPreference()) { if (!showEnableOemUnlockPreference()) {
keys.add(ENABLE_OEM_UNLOCK); keys.add(ENABLE_OEM_UNLOCK);
} }
if (!showEnableMultiWindowPreference()) {
keys.add(ENABLE_MULTI_WINDOW_KEY);
}
return keys; return keys;
} }
}; };