Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da

am: bbd92b5748

Change-Id: I15a40bcae625d5bacb0217c0a5f8ea16862e2fc4

src/com/android/settings/gestures/AssistGestureSettings.java

@@ -79,9 +79,17 @@ public class AssistGestureSettings extends DashboardFragment {
                 }
 
                 @Override
-                public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+                public List<AbstractPreferenceController> getPreferenceControllers(
+                        Context context) {
                     return buildPreferenceControllers(context, null /* lifecycle */);
                 }
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return new AssistGesturePreferenceController(context, null /* lifecycle */,
+                            null /* key */, false /* assistOnly */)
+                            .isAvailable();
+                }
             };
 }