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

Remove VibrationAttributes#CATEGORY_KEYBOARD (in Settings)

Browse Source 
Since CL[1], [2] introduced USAGE_IME_FEEDBACK in VibrationAttributes
to be able to specify default / current vibration in VibrationSettings
according to the vibration usage naturally without using this category
attribute + a bypass flag to only support a fixed vibration scaling.

Remove CATEGORY_KEYBOARD attribute and replacing with USAGE_IME_FEEDBACK
in Settings for cleaning up logic.

[1]: I6256c4f47a8bbee4b649d35eabfbc0c94215c0d7
[2]: I764aa8bd72889d4af62b30bff75af9033f22052b

Flag: EXEMPT refactor
Bug: 332661766
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I532e7d184d235bfa266fb590e60802c4e2fa7df2
This commit is contained in:
Ming-Shin Lu
2024-07-31 18:09:46 +00:00
parent e3702e9b14
commit 8ec4d71630
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,