From 77dab4be6486c4ffa2d2b2a8660a57510533c565 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Thu, 12 Mar 2015 12:10:13 -0700
Subject: Remove multi-window developer setting from search index if disabled.

Bug: 19494313
Change-Id: I6339d06a4b2ffe712ff8a2a3e72ddfdc63244d28
---
 src/com/android/settings/DevelopmentSettings.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

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;
                 }
             };
-- 
cgit v1.1