Merge "Can't switch navigation mode from search results" into qt-dev

am: aad3cdcf5f

Change-Id: I8934be985dfd51a5d2ec5b6dd873caf0fab75a67

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

@@ -42,11 +42,6 @@ public class SystemNavigationEdgeToEdgePreferenceController extends
         super(context, overlayManager, key);
     }
 
-    @Override
-    public boolean isSliceable() {
-        return TextUtils.equals(PREF_KEY_EDGE_TO_EDGE, getPreferenceKey());
-    }
-
     @Override
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY);

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

@@ -42,11 +42,6 @@ public class SystemNavigationLegacyPreferenceController extends
         super(context, overlayManager, key);
     }
 
-    @Override
-    public boolean isSliceable() {
-        return TextUtils.equals(PREF_KEY_LEGACY, getPreferenceKey());
-    }
-
     @Override
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY);

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

@@ -42,11 +42,6 @@ public class SystemNavigationSwipeUpPreferenceController extends
         super(context, overlayManager, key);
     }
 
-    @Override
-    public boolean isSliceable() {
-        return TextUtils.equals(PREF_KEY_SWIPE_UP, getPreferenceKey());
-    }
-
     @Override
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         setNavBarInteractionMode(mOverlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY);

tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java

@@ -180,8 +180,8 @@ public class SystemNavigationEdgeToEdgePreferenceControllerTest {
     }
 
     @Test
-    public void isSliceableCorrectKey_returnsTrue() {
+    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isTrue();
+        assertThat(mController.isSliceable()).isFalse();
     }
 
     @Test

tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java

@@ -182,8 +182,8 @@ public class SystemNavigationLegacyPreferenceControllerTest {
     }
 
     @Test
-    public void isSliceableCorrectKey_returnsTrue() {
+    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isTrue();
+        assertThat(mController.isSliceable()).isFalse();
     }
 
     @Test

tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java

@@ -180,8 +180,8 @@ public class SystemNavigationSwipeUpPreferenceControllerTest {
     }
 
     @Test
-    public void isSliceableCorrectKey_returnsTrue() {
+    public void isSliceable_returnsFalse() {
-        assertThat(mController.isSliceable()).isTrue();
+        assertThat(mController.isSliceable()).isFalse();
     }
 
     @Test