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

[Physical Keyboard][A11y Page] Add custom slider

Browse Source 
add slider for setting custom value under bounce key dialog.

demo video: b/346949547#comment26

Bug: 346949547
Test: atest SettingsRoboTests
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Change-Id: I3b7f08ebe5ebc287e61713749c193c8b1cf71b99
This commit is contained in:
shaoweishen
2024-08-26 09:41:09 +00:00
committed by Shaowei Shen
parent 899a6d8f75
commit 31d82a0288
2 changed files with 144 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,11 @@ import android.hardware.input.InputSettings;
import android.net.Uri;
import android.provider.Settings;
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.Nullable;
@@ -33,9 +37,13 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settingslib.PrimarySwitchPreference;
import java.util.concurrent.TimeUnit;
public class KeyboardAccessibilityBounceKeysController extends
InputSettingPreferenceController implements
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;
private AlertDialog mAlertDialog;
@@ -62,7 +70,7 @@ public class KeyboardAccessibilityBounceKeysController extends
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
public boolean handlePreferenceTreeClick(@NonNull Preference preference) {
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
return false;
}
@@ -105,23 +113,87 @@ public class KeyboardAccessibilityBounceKeysController extends
(dialog, which) -> {
RadioGroup radioGroup =
mAlertDialog.findViewById(R.id.bounce_key_value_group);
int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
int 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;
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 radioGroup = mAlertDialog.findViewById(R.id.bounce_key_value_group);
int bounceKeysThreshold = InputSettings.getAccessibilityBounceKeysThreshold(context);
switch (bounceKeysThreshold) {
case 600 -> radioGroup.check(R.id.bounce_key_value_600);
case 400 -> radioGroup.check(R.id.bounce_key_value_400);
default -> radioGroup.check(R.id.bounce_key_value_200);
}
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
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 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);
}
}
}
}