Merge "[Audiosharing] Fix call audio device in call" into main
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c01d162..6408ab1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1074,28 +1074,6 @@
</activity>
<activity
- android:name=".Settings$LanguageAndInputSettingsActivity"
- android:label="@string/language_settings"
- android:exported="true"
- android:icon="@drawable/ic_settings_language">
- <intent-filter>
- <action android:name="android.settings.LANGUAGE_SETTINGS"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.VOICE_LAUNCH"/>
- <category android:name="android.intent.category.DEFAULT"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.language.LanguageAndInputSettings"/>
- <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
- android:value="@string/menu_key_system"/>
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true"/>
- </activity>
-
- <activity
android:name=".Settings$LanguageSettingsActivity"
android:label="@string/languages_settings"
android:exported="true"
@@ -1225,9 +1203,9 @@
android:label="@string/language_input_gesture_title"
android:clearTaskOnLaunch="true"
android:exported="true"
- android:targetActivity="Settings$LanguageAndInputSettingsActivity">
+ android:targetActivity="Settings$LanguageSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.language.LanguageAndInputSettings" />
+ android:value="com.android.settings.language.LanguageSettings" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_system"/>
</activity-alias>
diff --git a/res/layout/dialog_a11y_bounce_key.xml b/res/layout/dialog_a11y_bounce_key.xml
new file mode 100644
index 0000000..7e23692
--- /dev/null
+++ b/res/layout/dialog_a11y_bounce_key.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2024 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/bounce_key_dialog_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:textSize="20sp"
+ android:gravity="center_horizontal"
+ android:text="@string/bounce_keys_dialog_title"
+ android:textColor="?android:attr/textColorPrimary"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+ />
+
+ <TextView
+ android:id="@+id/bounce_key_dialog_subtitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="26dp"
+ android:layout_marginTop="8dp"
+ android:textSize="16sp"
+ android:gravity="center"
+ android:text="@string/bounce_keys_dialog_subtitle"
+ android:textColor="?android:attr/textColorSecondary"
+ />
+
+ <RadioGroup
+ android:id="@+id/bounce_key_value_group"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dp"
+ android:layout_marginTop="16dp">
+
+ <RadioButton
+ android:id="@+id/bounce_key_value_200"
+ android:text="@string/bounce_keys_dialog_option_200"
+ android:paddingStart="12dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:background="@null"/>
+ <RadioButton
+ android:id="@+id/bounce_key_value_400"
+ android:text="@string/bounce_keys_dialog_option_400"
+ android:paddingStart="12dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginTop="16dp"
+ android:background="@null"/>
+ <RadioButton
+ android:id="@+id/bounce_key_value_600"
+ android:text="@string/bounce_keys_dialog_option_600"
+ android:paddingStart="12dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginTop="16dp"
+ android:background="@null"/>
+ </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ff00ce..5326fa5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4520,11 +4520,21 @@
<!-- Title for the 'Bounce keys' preference switch. [CHAR LIMIT=35] -->
<string name="bounce_keys">Bounce keys</string>
<!-- Summary text for the 'Bounce keys' preference sub-screen. [CHAR LIMIT=300] -->
- <string name="bounce_keys_summary">The keyboard ignores quickly repeated presses of the same key within <xliff:g id="bounce_keys_threshold" example="500">%1$d</xliff:g> ms</string>
+ <string name="bounce_keys_summary">The keyboard ignores quickly repeated presses of the same key </string>
+ <!-- Title for the 'Bounce keys' threshold dialog. [CHAR LIMIT=35] -->
+ <string name="bounce_keys_dialog_title">Bounce key threshold</string>
+ <!-- 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>
+ <!-- Option title for the 'Bounce keys' threshold dialog for 200 millisecond. [CHAR LIMIT=35] -->
+ <string name="bounce_keys_dialog_option_200">0.2s</string>
+ <!-- Option title for the 'Bounce keys' threshold dialog for 400 millisecond. [CHAR LIMIT=35] -->
+ <string name="bounce_keys_dialog_option_400">0.4s</string>
+ <!-- Option title for the 'Bounce keys' threshold dialog for 600 millisecond. [CHAR LIMIT=35] -->
+ <string name="bounce_keys_dialog_option_600">0.6s</string>
<!-- Title for the 'Slow keys' preference switch. [CHAR LIMIT=35] -->
<string name="slow_keys">Slow keys</string>
<!-- Summary text for the 'Slow keys' preference sub-screen. [CHAR LIMIT=300] -->
- <string name="slow_keys_summary">Adjusts the time it takes for a key press to activate to <xliff:g id="slow_keys_threshold" example="500">%1$d</xliff:g> ms</string>
+ <string name="slow_keys_summary">Adjusts the time it takes for a key press to activate</string>
<!-- Title for the 'Sticky keys' preference switch. [CHAR LIMIT=35] -->
<string name="sticky_keys">Sticky keys</string>
<!-- Summary text for the 'Sticky keys' preference sub-screen. [CHAR LIMIT=300] -->
@@ -4532,7 +4542,7 @@
<!-- Title for a toggle switch for 'mouse' keys, an accessibility setting that allows the mouse pointer to be controlled using certain keys on a physical keyboard if keyboard is connected. [CHAR LIMIT=35] -->
<string name="mouse_keys">Mouse keys</string>
<!-- Summary text for the accessibility setting 'Mouse keys' preference sub-screen. [CHAR LIMIT=100] -->
- <string name="mouse_keys_summary">Use the physical keyboard to control the mouse.</string>
+ <string name="mouse_keys_summary">Use your keyboard to control the pointer</string>
<!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->
<string name="keyboard_shortcuts_helper">Keyboard shortcuts</string>
<!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->
diff --git a/res/xml/physical_keyboard_a11y_settings.xml b/res/xml/physical_keyboard_a11y_settings.xml
index eb787d0..62479f9 100644
--- a/res/xml/physical_keyboard_a11y_settings.xml
+++ b/res/xml/physical_keyboard_a11y_settings.xml
@@ -32,9 +32,10 @@
android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/>
- <SwitchPreferenceCompat
+ <com.android.settingslib.PrimarySwitchPreference
android:key="accessibility_bounce_keys"
android:title="@string/bounce_keys"
+ android:summary="@string/bounce_keys_summary"
android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/>
@@ -42,6 +43,7 @@
android:key="accessibility_slow_keys"
android:title="@string/slow_keys"
android:defaultValue="false"
+ android:summary="@string/slow_keys_summary"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" />
<SwitchPreferenceCompat
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 7678338..f7110b4 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -95,7 +95,6 @@
public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }
public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocalePickerActivity extends SettingsActivity { /* empty */ }
- public static class LanguageAndInputSettingsActivity extends SettingsActivity { /* empty */ }
public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for the regional preferences settings. */
public static class RegionalPreferencesActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt b/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
index b16bff1..ba6d1a6 100644
--- a/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
+++ b/src/com/android/settings/bluetooth/ui/model/DeviceSettingPreferenceModel.kt
@@ -18,6 +18,7 @@
import android.content.Intent
import com.android.settingslib.bluetooth.devicesettings.DeviceSettingId
+import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingActionModel
import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
import com.android.settingslib.bluetooth.devicesettings.shared.model.ToggleModel
@@ -32,7 +33,7 @@
val title: String,
val summary: String? = null,
val icon: DeviceSettingIcon? = null,
- val intent: Intent? = null,
+ val action: DeviceSettingActionModel? = null,
) : DeviceSettingPreferenceModel
/** Models a switch preference. */
@@ -43,7 +44,7 @@
val icon: DeviceSettingIcon? = null,
val checked: Boolean,
val onCheckedChange: ((Boolean) -> Unit),
- val intent: Intent? = null,
+ val action: DeviceSettingActionModel? = null,
) : DeviceSettingPreferenceModel
/** Models a multi-toggle preference. */
diff --git a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
index ecd700b..5418a04 100644
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
@@ -55,6 +55,7 @@
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settings.spa.preference.ComposePreference
import com.android.settingslib.bluetooth.CachedBluetoothDevice
+import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingActionModel
import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingConfigItemModel
import com.android.settingslib.bluetooth.devicesettings.shared.model.DeviceSettingIcon
import com.android.settingslib.spa.framework.theme.SettingsDimension
@@ -313,10 +314,10 @@
return { deviceSettingIcon(model.icon) }
}
}
- if (model.intent != null) {
+ if (model.action != null) {
TwoTargetSwitchPreference(
switchPrefModel,
- primaryOnClick = { startActivity(model.intent) },
+ primaryOnClick = { triggerAction(model.action) },
)
} else {
SwitchPreference(switchPrefModel)
@@ -330,7 +331,7 @@
override val title = model.title
override val summary = { model.summary ?: "" }
override val onClick = {
- model.intent?.let { startActivity(it) }
+ model.action?.let { triggerAction(it) }
Unit
}
override val icon: (@Composable () -> Unit)?
@@ -382,9 +383,16 @@
icon?.let { Icon(it, modifier = Modifier.size(SettingsDimension.itemIconSize)) }
}
- private fun startActivity(intent: Intent) {
- intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- context.startActivity(intent)
+ private fun triggerAction(action: DeviceSettingActionModel) {
+ when (action) {
+ is DeviceSettingActionModel.IntentAction -> {
+ action.intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ context.startActivity(action.intent)
+ }
+ is DeviceSettingActionModel.PendingIntentAction -> {
+ action.pendingIntent.send()
+ }
+ }
}
private fun getPreferenceKey(settingId: Int) = "DEVICE_SETTING_${settingId}"
diff --git a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
index fe66cb5..a9444a5 100644
--- a/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
+++ b/src/com/android/settings/bluetooth/ui/viewmodel/BluetoothDeviceDetailsViewModel.kt
@@ -101,7 +101,7 @@
DeviceSettingStateModel.ActionSwitchPreferenceState(newState)
)
},
- intent = intent,
+ action = action,
)
} else {
DeviceSettingPreferenceModel.PlainPreference(
@@ -109,7 +109,7 @@
title = title,
summary = summary,
icon = icon,
- intent = intent,
+ action = action,
)
}
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 734bddc..3e92d5f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -437,8 +437,6 @@
Settings.AdaptiveBrightnessActivity.class.getName(),
// Home page > Security & screen lock
Settings.LocationSettingsActivity.class.getName(),
- // Home page > System
- Settings.LanguageAndInputSettingsActivity.class.getName(),
Settings.LanguageSettingsActivity.class.getName(),
Settings.KeyboardSettingsActivity.class.getName(),
Settings.DateTimeSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityController.java b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
similarity index 87%
rename from src/com/android/settings/inputmethod/KeyboardAccessibilityController.java
rename to src/com/android/settings/inputmethod/InputSettingPreferenceController.java
index 25a93b0..6d462c2 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityController.java
+++ b/src/com/android/settings/inputmethod/InputSettingPreferenceController.java
@@ -35,25 +35,25 @@
import com.android.settings.keyboard.Flags;
/**
- * Abstract class for toggle controllers of Keyboard accessibility related function.
+ * Abstract class for toggle controllers of Keyboard input setting related function.
*/
-public abstract class KeyboardAccessibilityController extends TogglePreferenceController implements
+public abstract class InputSettingPreferenceController extends TogglePreferenceController implements
LifecycleObserver {
private final ContentResolver mContentResolver;
private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
@Override
public void onChange(boolean selfChange, Uri uri) {
if (getSettingUri().equals(uri)) {
- updateKeyboardAccessibilitySettings();
+ onInputSettingUpdated();
}
}
};
- protected abstract void updateKeyboardAccessibilitySettings();
+ protected abstract void onInputSettingUpdated();
protected abstract Uri getSettingUri();
- public KeyboardAccessibilityController(@NonNull Context context,
+ public InputSettingPreferenceController(@NonNull Context context,
@NonNull String preferenceKey) {
super(context, preferenceKey);
mContentResolver = context.getContentResolver();
@@ -94,7 +94,7 @@
false,
mContentObserver,
UserHandle.myUserId());
- updateKeyboardAccessibilitySettings();
+ onInputSettingUpdated();
}
private void unregisterSettingsObserver() {
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
index 6dad8c0..559b2e4 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysController.java
@@ -20,20 +20,38 @@
import android.hardware.input.InputSettings;
import android.net.Uri;
import android.provider.Settings;
+import android.text.TextUtils;
+import android.widget.RadioGroup;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settingslib.PrimarySwitchPreference;
public class KeyboardAccessibilityBounceKeysController extends
- KeyboardAccessibilityController implements
+ InputSettingPreferenceController implements
LifecycleObserver {
public static final int BOUNCE_KEYS_THRESHOLD = 500;
+ private AlertDialog mAlertDialog;
+ @Nullable
+ private PrimarySwitchPreference mPrimaryPreference;
+
public KeyboardAccessibilityBounceKeysController(@NonNull Context context,
@NonNull String key) {
super(context, key);
+ constructDialog(context);
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPrimaryPreference = screen.findPreference(getPreferenceKey());
}
@Override
@@ -44,6 +62,17 @@
}
@Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ return false;
+ }
+ if (mAlertDialog != null) {
+ mAlertDialog.show();
+ }
+ return true;
+ }
+
+ @Override
public boolean isChecked() {
return InputSettings.isAccessibilityBounceKeysEnabled(mContext);
}
@@ -55,16 +84,12 @@
return true;
}
- @NonNull
@Override
- public CharSequence getSummary() {
- return mContext.getString(R.string.bounce_keys_summary, BOUNCE_KEYS_THRESHOLD);
- }
-
- @Override
- protected void updateKeyboardAccessibilitySettings() {
- setChecked(
- InputSettings.isAccessibilityBounceKeysEnabled(mContext));
+ protected void onInputSettingUpdated() {
+ if (mPrimaryPreference != null) {
+ mPrimaryPreference.setChecked(
+ InputSettings.isAccessibilityBounceKeysEnabled(mContext));
+ }
}
@Override
@@ -72,4 +97,31 @@
return Settings.Secure.getUriFor(
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);
+ 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;
+ 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);
+ }
+ });
+ }
}
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
index 7c7ad37..57ae88a 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityMouseKeysController.java
@@ -23,15 +23,26 @@
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
public class KeyboardAccessibilityMouseKeysController extends
- KeyboardAccessibilityController implements
+ InputSettingPreferenceController implements
LifecycleObserver {
+
+ private TwoStatePreference mTwoStatePreference;
+
public KeyboardAccessibilityMouseKeysController(@NonNull Context context, @NonNull String key) {
super(context, key);
}
@Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mTwoStatePreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
public boolean isChecked() {
return InputSettings.isAccessibilityMouseKeysEnabled(mContext);
}
@@ -51,9 +62,11 @@
}
@Override
- protected void updateKeyboardAccessibilitySettings() {
- setChecked(
- InputSettings.isAccessibilityMouseKeysEnabled(mContext));
+ protected void onInputSettingUpdated() {
+ if (mTwoStatePreference != null) {
+ mTwoStatePreference.setChecked(
+ InputSettings.isAccessibilityMouseKeysEnabled(mContext));
+ }
}
@Override
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
index 5110663..d8602df 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilitySlowKeysController.java
@@ -23,19 +23,27 @@
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleObserver;
-
-import com.android.settings.R;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
public class KeyboardAccessibilitySlowKeysController extends
- KeyboardAccessibilityController implements
+ InputSettingPreferenceController implements
LifecycleObserver {
public static final int SLOW_KEYS_THRESHOLD = 500;
+ private TwoStatePreference mTwoStatePreference;
+
public KeyboardAccessibilitySlowKeysController(@NonNull Context context, @NonNull String key) {
super(context, key);
}
@Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mTwoStatePreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
public boolean isChecked() {
return InputSettings.isAccessibilitySlowKeysEnabled(mContext);
}
@@ -54,16 +62,12 @@
: UNSUPPORTED_ON_DEVICE;
}
- @NonNull
@Override
- public CharSequence getSummary() {
- return mContext.getString(R.string.slow_keys_summary, SLOW_KEYS_THRESHOLD);
- }
-
- @Override
- protected void updateKeyboardAccessibilitySettings() {
- setChecked(
- InputSettings.isAccessibilitySlowKeysEnabled(mContext));
+ protected void onInputSettingUpdated() {
+ if (mTwoStatePreference != null) {
+ mTwoStatePreference.setChecked(
+ InputSettings.isAccessibilitySlowKeysEnabled(mContext));
+ }
}
@Override
diff --git a/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java b/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
index a62d80b..fd2cb2e 100644
--- a/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
+++ b/src/com/android/settings/inputmethod/KeyboardAccessibilityStickyKeysController.java
@@ -23,16 +23,27 @@
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
public class KeyboardAccessibilityStickyKeysController extends
- KeyboardAccessibilityController implements
+ InputSettingPreferenceController implements
LifecycleObserver {
+
+ private TwoStatePreference mTwoStatePreference;
+
public KeyboardAccessibilityStickyKeysController(@NonNull Context context,
@NonNull String key) {
super(context, key);
}
@Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mTwoStatePreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
public boolean isChecked() {
return InputSettings.isAccessibilityStickyKeysEnabled(mContext);
}
@@ -52,9 +63,11 @@
}
@Override
- protected void updateKeyboardAccessibilitySettings() {
- setChecked(
- InputSettings.isAccessibilityStickyKeysEnabled(mContext));
+ protected void onInputSettingUpdated() {
+ if (mTwoStatePreference != null) {
+ mTwoStatePreference.setChecked(
+ InputSettings.isAccessibilityStickyKeysEnabled(mContext));
+ }
}
@Override
diff --git a/src/com/android/settings/widget/TintDrawable.java b/src/com/android/settings/widget/TintDrawable.java
index 7b34890..caa683b 100644
--- a/src/com/android/settings/widget/TintDrawable.java
+++ b/src/com/android/settings/widget/TintDrawable.java
@@ -39,7 +39,7 @@
* underlying drawable. This class should only be used in XML.
*
* @attr ref android.R.styleable#DrawableWrapper_drawable
- * @attr ref R.styleable#TintDrawable_tint
+ * @attr ref android.R.styleable#TintDrawable_tint
*/
public class TintDrawable extends DrawableWrapper {
private ColorStateList mTint;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
index 8ac5a5d..d16f697 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardAccessibilityBounceKeysControllerTest.java
@@ -18,39 +18,59 @@
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 @@
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);
+ }
}
diff --git a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
index f8e790f..656fa27 100644
--- a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.language;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.content.ComponentName;
@@ -41,10 +40,9 @@
}
@Test
- public void getAvailabilityStatus_featureFlagOff_LanguageAndInputSettingsActivitydisabled() {
+ public void getAvailabilityStatus_featureFlagOff_LanguageSettingsActivitydisabled() {
mController.getAvailabilityStatus();
- assertFalse(isActivityEnable(mContext, Settings.LanguageAndInputSettingsActivity.class));
assertTrue(isActivityEnable(mContext, Settings.LanguageSettingsActivity.class));
}