[Physical Keyboard][A11y Page] Add Bounce keys dialog
1.Add dialog for adjust bounce key to different values. demo video: b/346949547#comment24. 2.Update summary text. 3.When receive update from content uri, update toggle state directly. 4.Rename Controller to more suitable name. Bug: 346949547 Test: atest SettingsRoboTests Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled Change-Id: I94d8d1a77528b13f59b2d67dfa30e17dd177e385
This commit is contained in:
@@ -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 KeyboardAccessibilityBounceKeysControllerTest {
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
@Rule
|
||||
public MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
private static final String PREFERENCE_KEY = "accessibility_bounce_keys";
|
||||
@Mock
|
||||
private Preference mPreference;
|
||||
private Context mContext;
|
||||
private KeyboardAccessibilityBounceKeysController mKeyboardAccessibilityBounceKeysController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
|
||||
mKeyboardAccessibilityBounceKeysController = new KeyboardAccessibilityBounceKeysController(
|
||||
mContext,
|
||||
"accessibility_bounce_keys");
|
||||
PREFERENCE_KEY);
|
||||
when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -82,4 +102,28 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
|
||||
|
||||
assertThat(isEnabled).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handlePreferenceTreeClick_dialogShows() {
|
||||
mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
|
||||
assertThat(alertDialog.isShowing()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
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);
|
||||
|
||||
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
|
||||
ShadowLooper.idleMainLooper();
|
||||
|
||||
assertThat(alertDialog.isShowing()).isFalse();
|
||||
int threshold = InputSettings.getAccessibilityBounceKeysThreshold(mContext);
|
||||
assertThat(threshold).isEqualTo(200);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user