Merge "Create IntDef for haptic feedback constants" into main (438151b5) · Commits · e / os / android_frameworks_base

core/java/android/os/vibrator/HapticFeedbackRequest.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public final class HapticFeedbackRequest {
		private final int mFlags;

		private HapticFeedbackRequest(
		int feedbackConstant,
		@HapticFeedbackConstants.FeedbackConstant int feedbackConstant,
		@VibrationAttributes.Usage int usage,
		@HapticFeedbackConstants.Flags int flags) {
		mFeedbackConstant = feedbackConstant;
		@@ -52,6 +52,7 @@ public final class HapticFeedbackRequest {
		*
		* @see HapticFeedbackConstants
		*/
		@HapticFeedbackConstants.FeedbackConstant
		public int getFeedbackConstant() {
		return mFeedbackConstant;
		}
		@@ -105,7 +106,7 @@ public final class HapticFeedbackRequest {
		* will be constructed from the builder. This needs to be one of the constants
		* defined in {@link HapticFeedbackConstants}.
		*/
		public Builder(int constant) {
		public Builder(@HapticFeedbackConstants.FeedbackConstant int constant) {
		mFeedbackConstant = constant;
		}

+38 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,44 @@ public class HapticFeedbackConstants {

		private HapticFeedbackConstants() {}

		/** @hide */
		@IntDef(value = {
		NO_HAPTICS,
		LONG_PRESS,
		VIRTUAL_KEY,
		KEYBOARD_TAP,
		CLOCK_TICK,
		CALENDAR_DATE,
		CONTEXT_CLICK,
		KEYBOARD_RELEASE,
		VIRTUAL_KEY_RELEASE,
		TEXT_HANDLE_MOVE,
		DRAG_CROSSING,
		GESTURE_START,
		GESTURE_END,
		EDGE_SQUEEZE,
		EDGE_RELEASE,
		CONFIRM,
		REJECT,
		SCROLL_TICK,
		SCROLL_ITEM_FOCUS,
		SCROLL_LIMIT,
		TOGGLE_ON,
		TOGGLE_OFF,
		GESTURE_THRESHOLD_ACTIVATE,
		GESTURE_THRESHOLD_DEACTIVATE,
		DRAG_START,
		SEGMENT_TICK,
		SEGMENT_FREQUENT_TICK,
		SAFE_MODE_ENABLED,
		ASSISTANT_BUTTON,
		LONG_PRESS_POWER_BUTTON,
		BIOMETRIC_CONFIRM,
		BIOMETRIC_REJECT,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FeedbackConstant {}

		/**
		* No haptic feedback should be performed. Applications may use this value to indicate skipping
		* a call to {@link View#performHapticFeedback} entirely, or else rely that it will immediately