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

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