From 8f205a66c0e5059ae84cd95d74996bd5058696ac Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Thu, 2 May 2019 14:34:45 +0800 Subject: [PATCH] Can't switch navigation mode from search results 3 Navigation modes are mutually exclusive, we can't set all often them on. Therefore we will now show them as slices. Fixes: 131713601 Test: robolectric, manual Change-Id: I52e94dffe15ed20a23a5e4cea68a40b66158b3dd --- .../SystemNavigationEdgeToEdgePreferenceController.java | 5 ----- .../gestures/SystemNavigationLegacyPreferenceController.java | 5 ----- .../SystemNavigationSwipeUpPreferenceController.java | 5 ----- .../SystemNavigationEdgeToEdgePreferenceControllerTest.java | 4 ++-- .../SystemNavigationLegacyPreferenceControllerTest.java | 4 ++-- .../SystemNavigationSwipeUpPreferenceControllerTest.java | 4 ++-- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java b/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java index 11ff0949b05..337ad2ea2a3 100644 --- a/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java +++ b/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); diff --git a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java index 0b197845599..728c5df0342 100644 --- a/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java +++ b/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); diff --git a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java b/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java index 26c2201a1e5..cf2886f88a6 100644 --- a/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java +++ b/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); diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java index 740ff2cae29..a23f8dac26f 100644 --- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java @@ -180,8 +180,8 @@ public class SystemNavigationEdgeToEdgePreferenceControllerTest { } @Test - public void isSliceableCorrectKey_returnsTrue() { - assertThat(mController.isSliceable()).isTrue(); + public void isSliceable_returnsFalse() { + assertThat(mController.isSliceable()).isFalse(); } @Test diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java index 2c4f88a09ad..dc9e3d9ae9a 100644 --- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java @@ -182,8 +182,8 @@ public class SystemNavigationLegacyPreferenceControllerTest { } @Test - public void isSliceableCorrectKey_returnsTrue() { - assertThat(mController.isSliceable()).isTrue(); + public void isSliceable_returnsFalse() { + assertThat(mController.isSliceable()).isFalse(); } @Test diff --git a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java index 177d4987d1d..955ea0c631f 100644 --- a/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java @@ -180,8 +180,8 @@ public class SystemNavigationSwipeUpPreferenceControllerTest { } @Test - public void isSliceableCorrectKey_returnsTrue() { - assertThat(mController.isSliceable()).isTrue(); + public void isSliceable_returnsFalse() { + assertThat(mController.isSliceable()).isFalse(); } @Test