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

Bug: 19494313
Change-Id: I6339d06a4b2ffe712ff8a2a3e72ddfdc63244d28
This commit is contained in:
Wale Ogunwale
2015-03-12 12:10:13 -07:00
parent a044b1daa2
commit 77dab4be64

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;
} }
}; };