summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-03-29 01:09:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-29 01:09:30 +0000
commit84ad5d8891d3a6921b9cfd1329022840682d55e2 (patch)
tree172a62d76874c2306ce6bedacbeabfab5d8c90aa /api
parent16ff04ca38739350cf398c4081cfbf13cac33a9d (diff)
parent5d7db503bd779fb712391174a2b12327a0f9ec51 (diff)
downloadframeworks_base-84ad5d8891d3a6921b9cfd1329022840682d55e2.zip
frameworks_base-84ad5d8891d3a6921b9cfd1329022840682d55e2.tar.gz
frameworks_base-84ad5d8891d3a6921b9cfd1329022840682d55e2.tar.bz2
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51': Add InputDevice#supportsSource(int).
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index e8e8d64..4265417 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28314,6 +28314,7 @@ package android.view {
method public android.os.Vibrator getVibrator();
method public boolean[] hasKeys(int...);
method public boolean isVirtual();
+ method public boolean supportsSource(int);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
field public static final int KEYBOARD_TYPE_ALPHABETIC = 2; // 0x2