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

Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev

Browse Source
This commit is contained in:
Mehdi Alizadeh
2020-03-16 04:01:11 +00:00
committed by Android (Google) Code Review
parent ed39b5bb1a 3857e6f936
commit 42a906d874
4 changed files with 29 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
tests/robotests/src/com/android/settings/gestures/SystemNavigationGestureSettingsTest.java
View File

@@ -24,14 +24,9 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVE
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
import static com.android.settings.gestures.SystemNavigationGestureSettings.BACK_GESTURE_INSET_DEFAULT_OVERLAY;
import static com.android.settings.gestures.SystemNavigationGestureSettings.BACK_GESTURE_INSET_OVERLAYS;
import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_2BUTTONS;
import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_3BUTTONS;
import static com.android.settings.gestures.SystemNavigationGestureSettings.KEY_SYSTEM_NAV_GESTURAL;
import static com.android.settings.gestures.SystemNavigationGestureSettings.NAV_BAR_MODE_GESTURAL_OVERLAY_EXTRA_WIDE_BACK;
import static com.android.settings.gestures.SystemNavigationGestureSettings.NAV_BAR_MODE_GESTURAL_OVERLAY_NARROW_BACK;
import static com.android.settings.gestures.SystemNavigationGestureSettings.NAV_BAR_MODE_GESTURAL_OVERLAY_WIDE_BACK;
import static com.google.common.truth.Truth.assertThat;
@@ -39,7 +34,6 @@ import static junit.framework.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -116,96 +110,16 @@ public class SystemNavigationGestureSettingsTest {
@Test
public void testSetCurrentSystemNavigationMode() throws Exception {
mSettings.setBackSensitivity(mContext, mOverlayManager, 0);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_GESTURAL);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_NARROW_BACK, USER_CURRENT);
mSettings.setBackSensitivity(mContext, mOverlayManager, 1);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_GESTURAL);
mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_GESTURAL);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY, USER_CURRENT);
mSettings.setBackSensitivity(mContext, mOverlayManager, 2);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_GESTURAL);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_WIDE_BACK, USER_CURRENT);
mSettings.setBackSensitivity(mContext, mOverlayManager, 3);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_GESTURAL);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_EXTRA_WIDE_BACK, USER_CURRENT);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_2BUTTONS);
mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_2BUTTONS);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_2BUTTON_OVERLAY, USER_CURRENT);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_3BUTTONS);
mSettings.setCurrentSystemNavigationMode(mOverlayManager, KEY_SYSTEM_NAV_3BUTTONS);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_3BUTTON_OVERLAY, USER_CURRENT);
}
@Test
public void testSetCurrentSystemNavigationMode_backSensitivityValuePersists() throws Exception {
SettingsShadowResources.overrideResource(
R.integer.config_navBarInteractionMode, NAV_BAR_MODE_3BUTTON);
mSettings.setBackSensitivity(mContext, mOverlayManager, 2);
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_3BUTTONS);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_3BUTTON_OVERLAY, USER_CURRENT);
// Return to Gesture navigation, without setting the sensitivity value.
mSettings.setCurrentSystemNavigationMode(mContext, mOverlayManager,
KEY_SYSTEM_NAV_GESTURAL);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_WIDE_BACK, USER_CURRENT);
}
@Test
public void testGetBackSensitivity_default() {
assertEquals(BACK_GESTURE_INSET_DEFAULT_OVERLAY,
mSettings.getBackSensitivity(mContext, mOverlayManager));
}
@Test
public void testBackSensitivitySetterAndGetter_currentNavModeNotGestural() throws Exception {
SettingsShadowResources.overrideResource(
R.integer.config_navBarInteractionMode, NAV_BAR_MODE_3BUTTON);
mSettings.setBackSensitivity(mContext, mOverlayManager, 3);
assertEquals(3, mSettings.getBackSensitivity(mContext, mOverlayManager));
mSettings.setBackSensitivity(mContext, mOverlayManager, 2);
assertEquals(2, mSettings.getBackSensitivity(mContext, mOverlayManager));
verify(mOverlayManager, never()).setEnabledExclusiveInCategory(any(), anyInt());
}
@Test
public void testBackSensitivitySetterAndGetter_currentNavModeIsGestural() throws Exception {
SettingsShadowResources.overrideResource(
R.integer.config_navBarInteractionMode, NAV_BAR_MODE_GESTURAL);
when(mOverlayManager.getOverlayInfo(BACK_GESTURE_INSET_OVERLAYS[3], USER_CURRENT))
.thenReturn(mOverlayInfoEnabled);
mSettings.setBackSensitivity(mContext, mOverlayManager, 3);
assertEquals(3, mSettings.getBackSensitivity(mContext, mOverlayManager));
when(mOverlayManager.getOverlayInfo(BACK_GESTURE_INSET_OVERLAYS[2], USER_CURRENT))
.thenReturn(mOverlayInfoEnabled);
mSettings.setBackSensitivity(mContext, mOverlayManager, 2);
assertEquals(2, mSettings.getBackSensitivity(mContext, mOverlayManager));
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_WIDE_BACK, USER_CURRENT);
verify(mOverlayManager, times(1)).setEnabledExclusiveInCategory(
NAV_BAR_MODE_GESTURAL_OVERLAY_EXTRA_WIDE_BACK, USER_CURRENT);
}
}