Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "New haptic feedback constants" into oc-mr1-dev

Browse Source 
am: f3b78305ff

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5
This commit is contained in:
Yohei Yukawa
2017-08-24 21:14:36 +00:00
committed by android-build-merger
parent a750014a6d f3b78305ff
commit b737076a4e
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -44289,9 +44289,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
api/system-current.txt
View File

@@ -47892,9 +47892,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
api/test-current.txt
View File

@@ -44720,9 +44720,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 {

18
core/java/android/view/HapticFeedbackConstants.java
View File

@@ -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 VIRTUAL_KEY_RELEASE = 7;
public static final int KEYBOARD_PRESS = KEYBOARD_TAP;
/**
* The user has released a virtual keyboard key.
*/
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.

10
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -7793,13 +7793,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:
@@ -7810,8 +7806,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: