Merge "Remove VibrationAttributes#CATEGORY_KEYBOARD (in Settings)" into main (c88f990e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -128,15 +128,9 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc
		mMetricsFeatureProvider.action(mContext,
		SettingsEnums.ACTION_KEYBOARD_VIBRATION_CHANGED, isChecked);
		if (success && isChecked) {
		// Play the preview vibration effect when the toggle is on.
		final VibrationAttributes touchAttrs =
		VibrationPreferenceConfig.createPreviewVibrationAttributes(
		VibrationAttributes.USAGE_TOUCH);
		final VibrationAttributes keyboardAttrs =
		new VibrationAttributes.Builder(touchAttrs)
		.setCategory(VibrationAttributes.CATEGORY_KEYBOARD)
		.build();
		VibrationPreferenceConfig.playVibrationPreview(mVibrator, keyboardAttrs);
		// Play the preview vibration effect for the IME feedback when the toggle is on.
		VibrationPreferenceConfig.playVibrationPreview(
		mVibrator, VibrationAttributes.USAGE_IME_FEEDBACK);
		}
		return true;
		}

+2 −13

Original line number	Diff line number	Diff line
		@@ -68,19 +68,8 @@ public abstract class VibrationPreferenceConfig {
		/** Play a vibration effect with intensity just selected by the user. */
		public static void playVibrationPreview(Vibrator vibrator,
		@VibrationAttributes.Usage int vibrationUsage) {
		playVibrationPreview(vibrator, 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);
		vibrator.vibrate(PREVIEW_VIBRATION_EFFECT,
		createPreviewVibrationAttributes(vibrationUsage));
		}

		public VibrationPreferenceConfig(Context context, String settingKey,