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

34
res/layout/dialog_a11y_bounce_key.xml → res/layout/dialog_keyboard_a11y_input_setting_keys.xml
View File

@@ -22,47 +22,45 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/bounce_key_dialog_title" android:id="@+id/input_setting_keys_dialog_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:textSize="20sp" android:textSize="20sp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/bounce_keys_dialog_title"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:fontFamily="@*android:string/config_headlineFontFamilyMedium" android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
/> />
<TextView <TextView
android:id="@+id/bounce_key_dialog_subtitle" android:id="@+id/input_setting_keys_dialog_subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="26dp" android:layout_marginHorizontal="26dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:textSize="16sp" android:textSize="16sp"
android:gravity="center" android:gravity="center"
android:text="@string/bounce_keys_dialog_subtitle"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
/> />
<RadioGroup <RadioGroup
android:id="@+id/bounce_key_value_group" android:id="@+id/input_setting_keys_value_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="16dp"> android:layout_marginTop="16dp">
<RadioButton <RadioButton
android:id="@+id/bounce_key_value_200" android:id="@+id/input_setting_keys_value_200"
android:text="@string/bounce_keys_dialog_option_200" android:text="@string/input_setting_keys_dialog_option_200"
android:paddingStart="12dp" android:paddingStart="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
android:background="@null"/> android:background="@null"/>
<RadioButton <RadioButton
android:id="@+id/bounce_key_value_400" android:id="@+id/input_setting_keys_value_400"
android:text="@string/bounce_keys_dialog_option_400" android:text="@string/input_setting_keys_dialog_option_400"
android:paddingStart="12dp" android:paddingStart="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -70,8 +68,8 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:background="@null"/> android:background="@null"/>
<RadioButton <RadioButton
android:id="@+id/bounce_key_value_600" android:id="@+id/input_setting_keys_value_600"
android:text="@string/bounce_keys_dialog_option_600" android:text="@string/input_setting_keys_dialog_option_600"
android:paddingStart="12dp" android:paddingStart="12dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -85,14 +83,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="12dp"> android:layout_marginVertical="12dp">
<RadioButton <RadioButton
android:id="@+id/bounce_key_value_custom" android:id="@+id/input_setting_keys_value_custom"
android:paddingStart="12dp" android:paddingStart="12dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:background="@null"/> android:background="@null"/>
<LinearLayout <LinearLayout
android:id="@+id/custom_value_option" android:id="@+id/input_setting_keys_custom_value_option"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -100,15 +98,15 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingEnd="16dp"> android:paddingEnd="16dp">
<TextView <TextView
android:id="@+id/bounce_key_value_custom_title" android:id="@+id/input_setting_keys_value_custom_title"
android:text="Custom" android:text="@string/input_setting_keys_custom_title"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
<TextView <TextView
android:id="@+id/bounce_key_value_custom_value" android:id="@+id/input_setting_keys_value_custom_value"
android:text="custom value" android:text="@string/input_setting_keys_custom_value"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -116,7 +114,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:visibility="gone"/> android:visibility="gone"/>
<SeekBar <SeekBar
android:id="@+id/bounce_key_value_custom_slider" android:id="@+id/input_setting_keys_value_custom_slider"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="36dp" android:paddingEnd="36dp"
android:min="1" android:min="1"

17
res/values/strings.xml
View File

@@ -4525,12 +4525,17 @@
<string name="bounce_keys_dialog_title">Bounce key threshold</string> <string name="bounce_keys_dialog_title">Bounce key threshold</string>
<!-- Subtitle for the 'Bounce keys' threshold dialog. [CHAR LIMIT=300] --> <!-- Subtitle for the 'Bounce keys' threshold dialog. [CHAR LIMIT=300] -->
<string name="bounce_keys_dialog_subtitle">Choose the duration of time your keyboard ignores repeated key presses</string> <string name="bounce_keys_dialog_subtitle">Choose the duration of time your keyboard ignores repeated key presses</string>
<!-- Option title for the 'Bounce keys' threshold dialog for 200 millisecond. [CHAR LIMIT=35] --> <!-- Option title for the input setting keys threshold dialog for 200 millisecond. [CHAR LIMIT=35] -->
<string name="bounce_keys_dialog_option_200">0.2s</string> <string name="input_setting_keys_dialog_option_200">0.2s</string>
<!-- Option title for the 'Bounce keys' threshold dialog for 400 millisecond. [CHAR LIMIT=35] --> <!-- Option title for the input setting keys threshold dialog for 400 millisecond. [CHAR LIMIT=35] -->
<string name="bounce_keys_dialog_option_400">0.4s</string> <string name="input_setting_keys_dialog_option_400">0.4s</string>
<!-- Option title for the 'Bounce keys' threshold dialog for 600 millisecond. [CHAR LIMIT=35] --> <!-- Option title for the input setting keys threshold dialog for 600 millisecond. [CHAR LIMIT=35] -->
<string name="bounce_keys_dialog_option_600">0.6s</string> <string name="input_setting_keys_dialog_option_600">0.6s</string>
<!-- Option title for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
<string name="input_setting_keys_custom_title">Custom</string>
<!-- Option subtitle for the input setting keys threshold dialog for custom value. [CHAR LIMIT=35] -->
<string name="input_setting_keys_custom_value">custom value</string>
<!-- Title for the 'Slow keys' preference switch. [CHAR LIMIT=35] --> <!-- Title for the 'Slow keys' preference switch. [CHAR LIMIT=35] -->
<string name="slow_keys">Slow keys</string> <string name="slow_keys">Slow keys</string>
<!-- Summary text for the 'Slow keys' preference sub-screen. [CHAR LIMIT=300] --> <!-- Summary text for the 'Slow keys' preference sub-screen. [CHAR LIMIT=300] -->

14
res/xml/physical_keyboard_a11y_settings.xml
View File

@@ -19,35 +19,35 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/keyboard_a11y_settings" android:title="@string/keyboard_a11y_settings"
android:key="physical_keyboard_a11y"> android:key="physical_keyboard_a11y_page">
<PreferenceCategory <PreferenceCategory
android:key="keyboard_a11y_category" android:key="keyboard_a11y_page_category"
android:title="@string/keyboard_a11y_category"> android:title="@string/keyboard_a11y_category">
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="accessibility_sticky_keys" android:key="keyboard_a11y_page_sticky_keys"
android:title="@string/sticky_keys" android:title="@string/sticky_keys"
android:summary="@string/sticky_keys_summary" android:summary="@string/sticky_keys_summary"
android:defaultValue="false" android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/> settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/>
<com.android.settingslib.PrimarySwitchPreference <com.android.settingslib.PrimarySwitchPreference
android:key="accessibility_bounce_keys" android:key="keyboard_a11y_page_bounce_keys"
android:title="@string/bounce_keys" android:title="@string/bounce_keys"
android:summary="@string/bounce_keys_summary" android:summary="@string/bounce_keys_summary"
android:defaultValue="false" android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/> settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/>
<SwitchPreferenceCompat <com.android.settingslib.PrimarySwitchPreference
android:key="accessibility_slow_keys" android:key="keyboard_a11y_page_slow_keys"
android:title="@string/slow_keys" android:title="@string/slow_keys"
android:defaultValue="false" android:defaultValue="false"
android:summary="@string/slow_keys_summary" android:summary="@string/slow_keys_summary"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" /> settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="accessibility_mouse_keys" android:key="keyboard_a11y_page_mouse_keys"
android:title="@string/mouse_keys" android:title="@string/mouse_keys"
android:summary="@string/mouse_keys_summary" android:summary="@string/mouse_keys_summary"
android:defaultValue="false" android:defaultValue="false"

127
src/com/android/settings/inputmethod/InputSettingPreferenceController.java
View File

@@ -25,20 +25,31 @@ import android.database.ContentObserver;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.SeekBar;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.keyboard.Flags; import com.android.settings.keyboard.Flags;
import java.util.concurrent.TimeUnit;
/** /**
* Abstract class for toggle controllers of Keyboard input setting related function. * Abstract class for toggle controllers of Keyboard input setting related function.
*/ */
public abstract class InputSettingPreferenceController extends TogglePreferenceController implements public abstract class InputSettingPreferenceController extends TogglePreferenceController implements
LifecycleObserver { LifecycleObserver {
private static final int CUSTOM_PROGRESS_INTERVAL = 100;
private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) { private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
@Override @Override
@@ -48,11 +59,19 @@ public abstract class InputSettingPreferenceController extends TogglePreferenceC
} }
} }
}; };
protected AlertDialog mAlertDialog;
protected abstract void onInputSettingUpdated(); protected abstract void onInputSettingUpdated();
protected abstract Uri getSettingUri(); protected abstract Uri getSettingUri();
protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
}
protected int getInputSettingKeysValue() {
return 0;
}
public InputSettingPreferenceController(@NonNull Context context, public InputSettingPreferenceController(@NonNull Context context,
@NonNull String preferenceKey) { @NonNull String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
@@ -100,4 +119,112 @@ public abstract class InputSettingPreferenceController extends TogglePreferenceC
private void unregisterSettingsObserver() { private void unregisterSettingsObserver() {
mContentResolver.unregisterContentObserver(mContentObserver); mContentResolver.unregisterContentObserver(mContentObserver);
} }
protected void constructDialog(Context context, int titleRes, int subtitleRes) {
mAlertDialog = new AlertDialog.Builder(context)
.setView(R.layout.dialog_keyboard_a11y_input_setting_keys)
.setPositiveButton(android.R.string.ok,
(dialog, which) -> {
RadioGroup radioGroup =
mAlertDialog.findViewById(
R.id.input_setting_keys_value_group);
SeekBar seekbar = mAlertDialog.findViewById(
R.id.input_setting_keys_value_custom_slider);
RadioButton customRadioButton = mAlertDialog.findViewById(
R.id.input_setting_keys_value_custom);
int threshold;
if (customRadioButton.isChecked()) {
threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
} else {
int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
if (checkedRadioButtonId == R.id.input_setting_keys_value_600) {
threshold = 600;
} else if (checkedRadioButtonId
== R.id.input_setting_keys_value_400) {
threshold = 400;
} else if (checkedRadioButtonId
== R.id.input_setting_keys_value_200) {
threshold = 200;
} else {
threshold = 0;
}
}
updateInputSettingKeysValue(threshold);
})
.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
.create();
mAlertDialog.setOnShowListener(dialog -> {
RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
R.id.input_setting_keys_value_group);
RadioButton customRadioButton = mAlertDialog.findViewById(
R.id.input_setting_keys_value_custom);
TextView customValueTextView = mAlertDialog.findViewById(
R.id.input_setting_keys_value_custom_value);
SeekBar customProgressBar = mAlertDialog.findViewById(
R.id.input_setting_keys_value_custom_slider);
TextView titleTextView = mAlertDialog.findViewById(
R.id.input_setting_keys_dialog_title);
TextView subTitleTextView = mAlertDialog.findViewById(
R.id.input_setting_keys_dialog_subtitle);
titleTextView.setText(titleRes);
subTitleTextView.setText(subtitleRes);
customProgressBar.incrementProgressBy(CUSTOM_PROGRESS_INTERVAL);
customProgressBar.setProgress(1);
View customValueView = mAlertDialog.findViewById(
R.id.input_setting_keys_custom_value_option);
customValueView.setOnClickListener(l -> customRadioButton.performClick());
customRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) {
cannedValueRadioGroup.clearCheck();
}
customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
customValueTextView.setText(
progressToThresholdInSecond(customProgressBar.getProgress()));
customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
buttonView.setChecked(isChecked);
});
cannedValueRadioGroup.setOnCheckedChangeListener(
(group, checkedId) -> customRadioButton.setChecked(false));
customProgressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
customValueTextView.setText(progressToThresholdInSecond(progress));
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
});
initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
customProgressBar);
});
}
private static String progressToThresholdInSecond(int progress) {
return String.valueOf((double) progress * CUSTOM_PROGRESS_INTERVAL
/ MILLISECOND_IN_SECONDS);
}
private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
RadioButton customRadioButton, TextView customValueTextView,
SeekBar customProgressBar) {
int inputSettingKeysThreshold = getInputSettingKeysValue();
switch (inputSettingKeysThreshold) {
case 600 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_600);
case 400 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_400);
case 0, 200 -> cannedValueRadioGroup.check(R.id.input_setting_keys_value_200);
default -> {
customValueTextView.setText(
String.valueOf(
(double) inputSettingKeysThreshold / MILLISECOND_IN_SECONDS));
customProgressBar.setProgress(inputSettingKeysThreshold / CUSTOM_PROGRESS_INTERVAL);
customRadioButton.setChecked(true);
}
}
}
} }

106
src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
View File

@@ -21,15 +21,9 @@ import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.SeekBar;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -37,23 +31,19 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.PrimarySwitchPreference; import com.android.settingslib.PrimarySwitchPreference;
import java.util.concurrent.TimeUnit;
public class KeyboardAccessibilityBounceKeysController extends public class KeyboardAccessibilityBounceKeysController extends
InputSettingPreferenceController implements InputSettingPreferenceController implements
LifecycleObserver { LifecycleObserver {
private static final int CUSTOM_PROGRESS_INTERVAL = 100;
private static final long MILLISECOND_IN_SECONDS = TimeUnit.SECONDS.toMillis(1);
public static final int BOUNCE_KEYS_THRESHOLD = 500; public static final int BOUNCE_KEYS_THRESHOLD = 500;
private AlertDialog mAlertDialog;
@Nullable @Nullable
private PrimarySwitchPreference mPrimaryPreference; private PrimarySwitchPreference mPrimaryPreference;
public KeyboardAccessibilityBounceKeysController(@NonNull Context context, public KeyboardAccessibilityBounceKeysController(@NonNull Context context,
@NonNull String key) { @NonNull String key) {
super(context, key); super(context, key);
constructDialog(context); constructDialog(context, R.string.bounce_keys_dialog_title,
R.string.bounce_keys_dialog_subtitle);
} }
@Override @Override
@@ -87,8 +77,7 @@ public class KeyboardAccessibilityBounceKeysController extends
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setAccessibilityBounceKeysThreshold(mContext, updateInputSettingKeysValue(isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
isChecked ? BOUNCE_KEYS_THRESHOLD : 0);
return true; return true;
} }
@@ -106,94 +95,13 @@ public class KeyboardAccessibilityBounceKeysController extends
Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS); Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS);
} }
private void constructDialog(Context context) {
mAlertDialog = new AlertDialog.Builder(context)
.setView(R.layout.dialog_a11y_bounce_key)
.setPositiveButton(android.R.string.ok,
(dialog, which) -> {
RadioGroup radioGroup =
mAlertDialog.findViewById(R.id.bounce_key_value_group);
SeekBar seekbar = mAlertDialog.findViewById(
R.id.bounce_key_value_custom_slider);
RadioButton customRadioButton = mAlertDialog.findViewById(
R.id.bounce_key_value_custom);
int threshold;
if (customRadioButton.isChecked()) {
threshold = seekbar.getProgress() * CUSTOM_PROGRESS_INTERVAL;
} else {
int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
threshold = checkedRadioButtonId == R.id.bounce_key_value_600 ? 600
: checkedRadioButtonId == R.id.bounce_key_value_400 ? 400
: checkedRadioButtonId == R.id.bounce_key_value_200
? 200 : 0;
}
InputSettings.setAccessibilityBounceKeysThreshold(context, threshold);
})
.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
.create();
mAlertDialog.setOnShowListener(dialog -> {
RadioGroup cannedValueRadioGroup = mAlertDialog.findViewById(
R.id.bounce_key_value_group);
RadioButton customRadioButton = mAlertDialog.findViewById(R.id.bounce_key_value_custom);
TextView customValueTextView = mAlertDialog.findViewById(
R.id.bounce_key_value_custom_value);
SeekBar customProgressBar = mAlertDialog.findViewById(
R.id.bounce_key_value_custom_slider);
customProgressBar.incrementProgressBy(CUSTOM_PROGRESS_INTERVAL);
customProgressBar.setProgress(1);
View customValueView = mAlertDialog.findViewById(R.id.custom_value_option);
customValueView.setOnClickListener(l -> customRadioButton.performClick());
customRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) {
cannedValueRadioGroup.clearCheck();
}
customValueTextView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
customValueTextView.setText(
progressToThresholdInSecond(customProgressBar.getProgress()));
customProgressBar.setVisibility(isChecked ? View.VISIBLE : View.GONE);
buttonView.setChecked(isChecked);
});
cannedValueRadioGroup.setOnCheckedChangeListener(
(group, checkedId) -> customRadioButton.setChecked(false));
customProgressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override @Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
customValueTextView.setText(progressToThresholdInSecond(progress)); InputSettings.setAccessibilityBounceKeysThreshold(mContext, thresholdTimeMillis);
} }
@Override @Override
public void onStartTrackingTouch(SeekBar seekBar) { protected int getInputSettingKeysValue() {
} return InputSettings.getAccessibilityBounceKeysThreshold(mContext);
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
});
initStateBasedOnThreshold(cannedValueRadioGroup, customRadioButton, customValueTextView,
customProgressBar);
});
}
private static String progressToThresholdInSecond(int progress) {
return String.valueOf((double) progress * CUSTOM_PROGRESS_INTERVAL
/ MILLISECOND_IN_SECONDS);
}
private void initStateBasedOnThreshold(RadioGroup cannedValueRadioGroup,
RadioButton customRadioButton, TextView customValueTextView,
SeekBar customProgressBar) {
int bounceKeysThreshold = InputSettings.getAccessibilityBounceKeysThreshold(mContext);
switch (bounceKeysThreshold) {
case 600 -> cannedValueRadioGroup.check(R.id.bounce_key_value_600);
case 400 -> cannedValueRadioGroup.check(R.id.bounce_key_value_400);
case 0, 200 -> cannedValueRadioGroup.check(R.id.bounce_key_value_200);
default -> {
customValueTextView.setText(
String.valueOf(
(double) bounceKeysThreshold / MILLISECOND_IN_SECONDS));
customProgressBar.setProgress(bounceKeysThreshold / CUSTOM_PROGRESS_INTERVAL);
customRadioButton.setChecked(true);
}
}
} }
} }

41
src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
View File

@@ -20,27 +20,34 @@ import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.net.Uri; import android.net.Uri;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
public class KeyboardAccessibilitySlowKeysController extends public class KeyboardAccessibilitySlowKeysController extends
InputSettingPreferenceController implements InputSettingPreferenceController implements
LifecycleObserver { LifecycleObserver {
public static final int SLOW_KEYS_THRESHOLD = 500; public static final int SLOW_KEYS_THRESHOLD = 500;
private TwoStatePreference mTwoStatePreference; @Nullable
private PrimarySwitchPreference mPrimarySwitchPreference;
public KeyboardAccessibilitySlowKeysController(@NonNull Context context, @NonNull String key) { public KeyboardAccessibilitySlowKeysController(@NonNull Context context, @NonNull String key) {
super(context, key); super(context, key);
constructDialog(context, R.string.slow_keys, R.string.slow_keys_summary);
} }
@Override @Override
public void displayPreference(@NonNull PreferenceScreen screen) { public void displayPreference(@NonNull PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mTwoStatePreference = screen.findPreference(getPreferenceKey()); mPrimarySwitchPreference = screen.findPreference(getPreferenceKey());
} }
@Override @Override
@@ -50,8 +57,7 @@ public class KeyboardAccessibilitySlowKeysController extends
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setAccessibilitySlowKeysThreshold(mContext, updateInputSettingKeysValue(isChecked ? SLOW_KEYS_THRESHOLD : 0);
isChecked ? SLOW_KEYS_THRESHOLD : 0);
return true; return true;
} }
@@ -64,8 +70,8 @@ public class KeyboardAccessibilitySlowKeysController extends
@Override @Override
protected void onInputSettingUpdated() { protected void onInputSettingUpdated() {
if (mTwoStatePreference != null) { if (mPrimarySwitchPreference != null) {
mTwoStatePreference.setChecked( mPrimarySwitchPreference.setChecked(
InputSettings.isAccessibilitySlowKeysEnabled(mContext)); InputSettings.isAccessibilitySlowKeysEnabled(mContext));
} }
} }
@@ -75,4 +81,25 @@ public class KeyboardAccessibilitySlowKeysController extends
return Settings.Secure.getUriFor( return Settings.Secure.getUriFor(
Settings.Secure.ACCESSIBILITY_SLOW_KEYS); Settings.Secure.ACCESSIBILITY_SLOW_KEYS);
} }
@Override
public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false;
}
if (mAlertDialog != null) {
mAlertDialog.show();
}
return true;
}
@Override
protected void updateInputSettingKeysValue(int thresholdTimeMillis) {
InputSettings.setAccessibilitySlowKeysThreshold(mContext, thresholdTimeMillis);
}
@Override
protected int getInputSettingKeysValue() {
return InputSettings.getAccessibilitySlowKeysThreshold(mContext);
}
} }

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(); public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Rule @Rule
public MockitoRule mMockitoRule = MockitoJUnit.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 @Mock
private Preference mPreference; private Preference mPreference;
private Context mContext; private Context mContext;
@@ -116,8 +116,8 @@ public class KeyboardAccessibilityBounceKeysControllerTest {
public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() { public void handlePreferenceTreeClick_performClickOn200_updatesBounceKeysThreshold() {
mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference); mKeyboardAccessibilityBounceKeysController.handlePreferenceTreeClick(mPreference);
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
RadioGroup radioGroup = alertDialog.findViewById(R.id.bounce_key_value_group); RadioGroup radioGroup = alertDialog.findViewById(R.id.input_setting_keys_value_group);
radioGroup.check(R.id.bounce_key_value_200); radioGroup.check(R.id.input_setting_keys_value_200);
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick(); alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper(); ShadowLooper.idleMainLooper();

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

@@ -50,7 +50,7 @@ public class KeyboardAccessibilityMouseKeysControllerTest {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mKeyboardAccessibilityMouseKeysController = new KeyboardAccessibilityMouseKeysController( mKeyboardAccessibilityMouseKeysController = new KeyboardAccessibilityMouseKeysController(
mContext, mContext,
"accessibility_mouse_keys"); "keyboard_a11y_page_mouse_keys");
} }
@Test @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 com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputSettings; import android.hardware.input.InputSettings;
import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule; 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.core.BasePreferenceController;
import com.android.settings.keyboard.Flags; import com.android.settings.keyboard.Flags;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; 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.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLooper;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = { @Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class, com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowAlertDialogCompat.class,
}) })
public class KeyboardAccessibilitySlowKeysControllerTest { public class KeyboardAccessibilitySlowKeysControllerTest {
@Rule @Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); 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 Context mContext;
private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController; private KeyboardAccessibilitySlowKeysController mKeyboardAccessibilitySlowKeysController;
@Before @Before
public void setUp() { public void setUp() {
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
mKeyboardAccessibilitySlowKeysController = new KeyboardAccessibilitySlowKeysController( mKeyboardAccessibilitySlowKeysController = new KeyboardAccessibilitySlowKeysController(
mContext, mContext,
"accessibility_slow_keys"); PREFERENCE_KEY);
when(mPreference.getKey()).thenReturn(PREFERENCE_KEY);
} }
@Test @Test
@@ -82,4 +102,28 @@ public class KeyboardAccessibilitySlowKeysControllerTest {
assertThat(isEnabled).isFalse(); 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; mContext = RuntimeEnvironment.application;
mKeyboardAccessibilityStickyKeysController = new KeyboardAccessibilityStickyKeysController( mKeyboardAccessibilityStickyKeysController = new KeyboardAccessibilityStickyKeysController(
mContext, mContext,
"accessibility_sticky_keys"); "keyboard_a11y_page_sticky_keys");
} }
@Test @Test