diff options
| author | 2019-11-01 14:26:35 +0000 | |
|---|---|---|
| committer | 2019-11-01 14:26:35 +0000 | |
| commit | 12eafbf1736f2fb45e21e33cdb0416e2413feb12 (patch) | |
| tree | 6d6bad771409626740a2f0d0a8258f68439298d1 | |
| parent | 280f659058567e3ad9b670ebaeca60aac4f5366c (diff) | |
| parent | 31664f9093190cb1b1799835944c395a9cf483ff (diff) | |
Merge "Surface CONFIRM and REJECT vibration constants"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/HapticFeedbackConstants.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 276fddc437f8..7170bbd65db9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49181,6 +49181,7 @@ package android.view { public class HapticFeedbackConstants { field public static final int CLOCK_TICK = 4; // 0x4 + field public static final int CONFIRM = 16; // 0x10 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 @@ -49188,6 +49189,7 @@ package android.view { 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 REJECT = 17; // 0x11 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 diff --git a/core/java/android/view/HapticFeedbackConstants.java b/core/java/android/view/HapticFeedbackConstants.java index db01cea3e72b..37b9eb3bd3d1 100644 --- a/core/java/android/view/HapticFeedbackConstants.java +++ b/core/java/android/view/HapticFeedbackConstants.java @@ -115,13 +115,11 @@ public class HapticFeedbackConstants { /** * A haptic effect to signal the confirmation or successful completion of a user * interaction. - * @hide */ public static final int CONFIRM = 16; /** * A haptic effect to signal the rejection or failure of a user interaction. - * @hide */ public static final int REJECT = 17; |