Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff (c6f9b061) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -44331,9 +44331,13 @@ package android.view {
		field public static final int CONTEXT_CLICK = 6; // 0x6
		field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
		field public static final int FLAG_IGNORE_VIEW_SETTING = 1; // 0x1
		field public static final int KEYBOARD_PRESS = 3; // 0x3
		field public static final int KEYBOARD_RELEASE = 7; // 0x7
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int TEXT_HANDLE_MOVE = 9; // 0x9
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8
		}

		public class InflateException extends java.lang.RuntimeException {

+4 −0

Original line number	Diff line number	Diff line
		@@ -47937,9 +47937,13 @@ package android.view {
		field public static final int CONTEXT_CLICK = 6; // 0x6
		field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
		field public static final int FLAG_IGNORE_VIEW_SETTING = 1; // 0x1
		field public static final int KEYBOARD_PRESS = 3; // 0x3
		field public static final int KEYBOARD_RELEASE = 7; // 0x7
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int TEXT_HANDLE_MOVE = 9; // 0x9
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8
		}

		public class InflateException extends java.lang.RuntimeException {

+4 −0

Original line number	Diff line number	Diff line
		@@ -44772,9 +44772,13 @@ package android.view {
		field public static final int CONTEXT_CLICK = 6; // 0x6
		field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
		field public static final int FLAG_IGNORE_VIEW_SETTING = 1; // 0x1
		field public static final int KEYBOARD_PRESS = 3; // 0x3
		field public static final int KEYBOARD_RELEASE = 7; // 0x7
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int TEXT_HANDLE_MOVE = 9; // 0x9
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8
		}

		public class InflateException extends java.lang.RuntimeException {

+13 −5

Original line number	Diff line number	Diff line
		@@ -57,16 +57,24 @@ public class HapticFeedbackConstants {
		public static final int CONTEXT_CLICK = 6;

		/**
		* The user has released a virtual or software keyboard key.
		* @hide
		* The user has pressed a virtual or software keyboard key.
		*/
		public static final int KEYBOARD_PRESS = KEYBOARD_TAP;

		/**
		* The user has released a virtual keyboard key.
		*/
		public static final int VIRTUAL_KEY_RELEASE = 7;
		public static final int KEYBOARD_RELEASE = 7;

		/**
		* The user has released a virtual key.
		*/
		public static final int VIRTUAL_KEY_RELEASE = 8;

		/**
		* The user has performed a selection/insertion handle move on text field.
		* @hide
		*/
		public static final int TEXT_HANDLE_MOVE = 8;
		public static final int TEXT_HANDLE_MOVE = 9;

		/**
		* The phone has booted with safe mode enabled.

+6 −4

Original line number	Diff line number	Diff line
		@@ -7796,13 +7796,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private VibrationEffect getVibrationEffect(int effectId) {
		long[] pattern;
		switch (effectId) {
		case HapticFeedbackConstants.VIRTUAL_KEY:
		return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
		case HapticFeedbackConstants.LONG_PRESS:
		pattern = mLongPressVibePattern;
		break;
		case HapticFeedbackConstants.KEYBOARD_TAP:
		return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
		case HapticFeedbackConstants.CLOCK_TICK:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		case HapticFeedbackConstants.CALENDAR_DATE:
		@@ -7813,8 +7809,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		break;
		case HapticFeedbackConstants.CONTEXT_CLICK:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		case HapticFeedbackConstants.VIRTUAL_KEY:
		return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
		case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		case HapticFeedbackConstants.KEYBOARD_PRESS: // == HapticFeedbackConstants.KEYBOARD_TAP
		return VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
		case HapticFeedbackConstants.KEYBOARD_RELEASE:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		case HapticFeedbackConstants.TEXT_HANDLE_MOVE:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		default: