Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d131f19c authored Jun 06, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Jun 06, 2017

Merge "Add new haptic feedback constant for virtual key release."

parents e5ef6769 e14b0647

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -43936,6 +43936,7 @@ package android.view {
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 7; // 0x7
		}

		public class InflateException extends java.lang.RuntimeException {

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -47483,6 +47483,7 @@ package android.view {
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 7; // 0x7
		}

		public class InflateException extends java.lang.RuntimeException {

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -44319,6 +44319,7 @@ package android.view {
		field public static final int KEYBOARD_TAP = 3; // 0x3
		field public static final int LONG_PRESS = 0; // 0x0
		field public static final int VIRTUAL_KEY = 1; // 0x1
		field public static final int VIRTUAL_KEY_RELEASE = 7; // 0x7
		}

		public class InflateException extends java.lang.RuntimeException {

core/java/android/view/HapticFeedbackConstants.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -56,6 +56,11 @@ public class HapticFeedbackConstants {
		*/
		public static final int CONTEXT_CLICK = 6;

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

		/**
		* This is a private constant. Feel free to renumber as desired.
		* @hide

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -7692,6 +7692,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		break;
		case HapticFeedbackConstants.CONTEXT_CLICK:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		case HapticFeedbackConstants.VIRTUAL_KEY_RELEASE:
		return VibrationEffect.get(VibrationEffect.EFFECT_TICK);
		default:
		return null;
		}