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

Merge "Remove VibrationAttributes#CATEGORY_KEYBOARD (in Settings)" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-15 19:04:04 +00:00
committed by Android (Google) Code Review
parent e7c670ea27 8ec4d71630
commit c88f990e37
2 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
View File

@@ -110,7 +110,7 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (mContext.getResources().getBoolean( if (mContext.getResources().getBoolean(
com.android.internal.R.bool.config_keyboardVibrationSettingsSupported)) { com.android.internal.R.bool.config_keyboardVibrationSettingsSupported)) {
return AVAILABLE; return AVAILABLE;
} }
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
@@ -128,15 +128,9 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_KEYBOARD_VIBRATION_CHANGED, isChecked); SettingsEnums.ACTION_KEYBOARD_VIBRATION_CHANGED, isChecked);
if (success && isChecked) { if (success && isChecked) {
// Play the preview vibration effect when the toggle is on. // Play the preview vibration effect for the IME feedback when the toggle is on.
final VibrationAttributes touchAttrs = VibrationPreferenceConfig.playVibrationPreview(
VibrationPreferenceConfig.createPreviewVibrationAttributes( mVibrator, VibrationAttributes.USAGE_IME_FEEDBACK);
VibrationAttributes.USAGE_TOUCH);
final VibrationAttributes keyboardAttrs =
new VibrationAttributes.Builder(touchAttrs)
.setCategory(VibrationAttributes.CATEGORY_KEYBOARD)
.build();
VibrationPreferenceConfig.playVibrationPreview(mVibrator, keyboardAttrs);
} }
return true; return true;
} }

15
src/com/android/settings/accessibility/VibrationPreferenceConfig.java
View File

@@ -68,19 +68,8 @@ public abstract class VibrationPreferenceConfig {
/** Play a vibration effect with intensity just selected by the user. */ /** Play a vibration effect with intensity just selected by the user. */
public static void playVibrationPreview(Vibrator vibrator, public static void playVibrationPreview(Vibrator vibrator,
@VibrationAttributes.Usage int vibrationUsage) { @VibrationAttributes.Usage int vibrationUsage) {
playVibrationPreview(vibrator, createPreviewVibrationAttributes(vibrationUsage)); vibrator.vibrate(PREVIEW_VIBRATION_EFFECT,
} createPreviewVibrationAttributes(vibrationUsage));
/**
* Play a vibration effect with intensity just selected by the user.
*
* @param vibrator The {@link Vibrator} used to play the vibration.
* @param vibrationAttributes The {@link VibrationAttributes} to indicate the
* vibration information.
*/
public static void playVibrationPreview(Vibrator vibrator,
VibrationAttributes vibrationAttributes) {
vibrator.vibrate(PREVIEW_VIBRATION_EFFECT, vibrationAttributes);
} }
public VibrationPreferenceConfig(Context context, String settingKey, public VibrationPreferenceConfig(Context context, String settingKey,