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

[Physical Keyboard] Add slow keys dialog

Browse Source 
demo: https://screenshot.googleplex.com/7CPpfHvAixe9Awr.png
Add dialog for Slow keys, which have same set up with Bounce keys.
Move dialog logic to InputSettingPreferenceController, to reuse it from
slow keys controller.

Bug: 346949547
Test: atest SettingsRoboTests
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled

Change-Id: Ia4d74fcf3f20ed68cb252503e88d99ea79eae291
This commit is contained in:
shaoweishen
2024-10-15 04:53:55 +00:00
committed by Shaowei Shen
parent 9936dae2be
commit 7aefcf71b6
10 changed files with 254 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
View File

@@ -57,7 +57,7 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "accessibility_bounce_keys";
private static final String PREFERENCE_KEY = "keyboard_a11y_page_bounce_keys";
@Mock
private Preference mPreference;
private Context mContext;
@@ -116,8 +116,8 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
RadioGroup radioGroup = alertDialog.findViewById(R.id.bounce_key_value_group);
radioGroup.check(R.id.bounce_key_value_200);
RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();

2
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysControllerTest.java
View File

@@ -50,7 +50,7 @@ public class KeyboardAccessibilityMouseKeysControllerTest {
mContext = RuntimeEnvironment.application;
mKeyboardAccessibilityMouseKeysController = new KeyboardAccessibilityMouseKeysController(
mContext,
"accessibility_mouse_keys");
"keyboard_a11y_page_mouse_keys");
}
@Test

46
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysControllerTest.java
View File

@@ -18,39 +18,59 @@ package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.hardware.input.InputSettings;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.widget.RadioGroup;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.keyboard.Flags;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowAlertDialogCompat.class,
})
public class KeyboardAccessibilitySlowKeysControllerTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Rule
public MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final String PREFERENCE_KEY = "keyboard_a11y_page_slow_keys";
@Mock
private Preference mPreference;
private Context mContext;
private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
mKeyboardAccessibilitySlowKeysController = new KeyboardAccessibilitySlowKeysController(
mContext,
"accessibility_slow_keys");
PREFERENCE_KEY);
when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
}
@Test
@@ -82,4 +102,28 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
assertThat(isEnabled).isFalse();
}
@Test
public void handlePreferenceTreeClick_dialogShows() {
mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
}
@Test
public void handlePreferenceTreeClick_performClickOn200_updatesSlowKeysThreshold() {
mKeyboardAccessibilitySlowKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.input_setting_keys_value_200);
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(alertDialog.isShowing()).isFalse();
int threshold = InputSettings.getAccessibilitySlowKeysThreshold(mContext);
assertThat(threshold).isEqualTo(200);
}
}

2
tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysControllerTest.java
View File

@@ -50,7 +50,7 @@ public class KeyboardAccessibilityStickyKeysControllerTest {
mContext = RuntimeEnvironment.application;
mKeyboardAccessibilityStickyKeysController = new KeyboardAccessibilityStickyKeysController(
mContext,
"accessibility_sticky_keys");
"keyboard_a11y_page_sticky_keys");
}
@Test