diff options
| author | Michael Wright <michaelwr@google.com> | 2014-03-29 00:59:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-29 00:59:46 +0000 |
| commit | 4669cfff1ed590087eade846aee8b4ef58f31739 (patch) | |
| tree | c395a1942cc7570add9036adbfb4d95998e8a0fb /api | |
| parent | f1354dd206a74e1475e8c1f8682dfd9d5e146f00 (diff) | |
| parent | d020fd33d147c88a9cda4976d2fa559e55b4ab03 (diff) | |
| download | frameworks_base-4669cfff1ed590087eade846aee8b4ef58f31739.zip frameworks_base-4669cfff1ed590087eade846aee8b4ef58f31739.tar.gz frameworks_base-4669cfff1ed590087eade846aee8b4ef58f31739.tar.bz2 | |
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9caec2b..4712527 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26839,8 +26839,10 @@ package android.view { method public final boolean hasModifiers(int); method public final boolean hasNoModifiers(); method public final boolean isAltPressed(); + method public final boolean isCancelKey(); method public final boolean isCanceled(); method public final boolean isCapsLockOn(); + method public final boolean isConfirmKey(); method public final boolean isCtrlPressed(); method public final boolean isFunctionPressed(); method public static final boolean isGamepadButton(int); |