From 9c4e2d6767f68bbe8d58a81abb17735cdb430b9b Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Fri, 30 Nov 2018 16:52:46 +0800
Subject: [PATCH] Fix top level "Gestures" not appearing in search result

If the availability status equals AVAILABLE_UNSEARCHABLE,
the preference won't appear in the serch result so we change
the status to AVAILABLE.

Change-Id: Id3ab28c4974f42be9b06a58d9c0d284f23ef160f
Fixes: 117951603
Test: manual and robotests
---
 .../gestures/GesturesSettingPreferenceController.java         | 4 ++--
 .../gestures/GesturesSettingsPreferenceControllerTest.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 2e9b5a5c504..00b7a0c1b09 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -52,7 +52,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
         for (AbstractPreferenceController controller : mGestureControllers) {
             isAvailable = isAvailable || controller.isAvailable();
         }
-        return isAvailable ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
+        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     /**
@@ -101,4 +101,4 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
         }
         return mContext.getText(R.string.language_input_gesture_summary_off);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
index d8f800d520b..e892eb2bb46 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.gestures;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
@@ -81,7 +83,7 @@ public class GesturesSettingsPreferenceControllerTest {
         });
         ReflectionHelpers.setField(mController, "mGestureControllers", mControllers);
 
-        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test