diff options
| author | Raph Levien <raph@google.com> | 2013-09-18 20:40:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-18 20:40:26 +0000 |
| commit | ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0 (patch) | |
| tree | 837dbe93a63021dda497bd61f5e9795e27dcf6e0 /api/current.txt | |
| parent | a6f387a0551a82b76e86ae829ae3a39ad043c1c9 (diff) | |
| parent | 14f10e5d5f51bc54ca2a45ee62d3cfb6debd3af0 (diff) | |
| download | frameworks_base-ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0.zip frameworks_base-ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0.tar.gz frameworks_base-ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0.tar.bz2 | |
Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev
Diffstat (limited to 'api/current.txt')
| -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 db8f224..23dce93 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25019,7 +25019,9 @@ package android.text.method { method public static void clearMetaKeyState(android.text.Editable, int); method public long clearMetaKeyState(long, int); method public static final int getMetaState(java.lang.CharSequence); + method public static final int getMetaState(java.lang.CharSequence, android.view.KeyEvent); method public static final int getMetaState(java.lang.CharSequence, int); + method public static final int getMetaState(java.lang.CharSequence, int, android.view.KeyEvent); method public static final int getMetaState(long); method public static final int getMetaState(long, int); method public static long handleKeyDown(long, int, android.view.KeyEvent); |