Settings: disable wifi display from search indexing if disabled

If wifi display is disabled from the system property or from
the overlay file, disable its key indexing to stop appearing
it in search result. Also update the database version to reflect
the changes.
Also fix indexing for saved access point settings.

Issue-id: YAM-141

Change-Id: Ia3688e4b294ad67ab8029dd47d1067fd722cbff7

1 files changed, 5 insertions, 0 deletions

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 97353a8..2067887 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -820,6 +820,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     }
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
+
+                    if (!context.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_enableWifiDisplay) &&
+                            (SystemProperties.getInt(FORCE_WIFI_DISPLAY_ENABLE, -1) != 1)) {
+                        result.add(KEY_WIFI_DISPLAY);
                     }
                     return result;
                 }