PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: aad3cdcf5f

Change-Id: I8934be985dfd51a5d2ec5b6dd873caf0fab75a67
This commit is contained in:
Raff Tsai
2019-05-03 08:02:43 -07:00
committed by android-build-merger
parent 57177733d4 aad3cdcf5f
commit 288128f719
6 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
View File

@@ -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);

5
src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
View File

@@ -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);

5
src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
View File

@@ -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);

4
tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
View File

@@ -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

4
tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
View File

@@ -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

4
tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
View File

@@ -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