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

Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-01 10:09:08 +00:00
committed by Android (Google) Code Review
parent a6a4fe474c d9a4197d9d
commit 150ed0b071
11 changed files with 217 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/gestures/OneHandedActionPullDownPrefControllerTest.java
View File

@@ -105,4 +105,26 @@ public class OneHandedActionPullDownPrefControllerTest {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
@Test
public void getAvailabilityStatus_setShortcutEnabled_shouldEnabled() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mUtils.setNavigationBarMode(mContext, "0" /* 3-button mode */);
mUtils.setShortcutEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_setShortcutDisabled_shouldDisabled() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mUtils.setNavigationBarMode(mContext, "0" /* 3-button mode */);
mUtils.setShortcutEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
}

22
tests/robotests/src/com/android/settings/gestures/OneHandedActionShowNotificationPrefControllerTest.java
View File

@@ -104,4 +104,26 @@ public class OneHandedActionShowNotificationPrefControllerTest {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
@Test
public void getAvailabilityStatus_setShortcutEnabled_shouldEnabled() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mUtils.setNavigationBarMode(mContext, "0" /* 3-button mode */);
mUtils.setShortcutEnabled(mContext, true);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_setShortcutDisabled_shouldDisabled() {
SystemProperties.set(OneHandedSettingsUtils.SUPPORT_ONE_HANDED_MODE, "true");
OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
mUtils.setNavigationBarMode(mContext, "0" /* 3-button mode */);
mUtils.setShortcutEnabled(mContext, false);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
}

81
tests/robotests/src/com/android/settings/gestures/OneHandedPreferenceCategoryControllerTest.java Normal file
View File

@@ -0,0 +1,81 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.gestures;
import static junit.framework.TestCase.assertTrue;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserHandle;
import android.text.TextUtils;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class OneHandedPreferenceCategoryControllerTest {
private static final String KEY = "gesture_one_handed_mode_swipe_down";
private Context mContext;
private OneHandedSettingsUtils mUtils;
private OneHandedPreferenceCategoryController mController;
@Mock
private PreferenceCategory mPreference;
@Mock
private PreferenceScreen mScreen;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mUtils = new OneHandedSettingsUtils(mContext);
mController = new OneHandedPreferenceCategoryController(mContext, KEY);
OneHandedSettingsUtils.setUserId(UserHandle.myUserId());
mPreference = new PreferenceCategory(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
public void getTitle_set3ButtonMode_shouldReturnSetShortcutTo() {
mUtils.setNavigationBarMode(mContext, "0" /* 3 button */);
mController.displayPreference(mScreen);
assertTrue(TextUtils.equals(mPreference.getTitle(), mContext.getText(
R.string.one_handed_mode_use_shortcut_category)));
}
@Test
public void getTitle_setGestureMode_shouldReturnSwipeDownTo() {
mUtils.setNavigationBarMode(mContext, "2" /* fully gestural */);
mController.displayPreference(mScreen);
assertTrue(TextUtils.equals(mPreference.getTitle(), mContext.getText(
R.string.one_handed_mode_swipe_down_category)));
}
}