diff options
| author | Michael Wright <michaelwr@google.com> | 2015-06-24 16:12:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 16:12:22 +0000 |
| commit | 5edd0e06d5f75cb862f52cb65aa423c951eb2882 (patch) | |
| tree | f36728dce90c45a155ce4d038fc61dcf8002df1d /api | |
| parent | 838a29a659c2b7ee244140ea4042d90d48181145 (diff) | |
| parent | f18920ba3182087938e245fab8e3e3008a39606b (diff) | |
| download | frameworks_base-5edd0e06d5f75cb862f52cb65aa423c951eb2882.zip frameworks_base-5edd0e06d5f75cb862f52cb65aa423c951eb2882.tar.gz frameworks_base-5edd0e06d5f75cb862f52cb65aa423c951eb2882.tar.bz2 | |
Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index aa07a97..bf2f9cb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34800,6 +34800,7 @@ package android.view { field public static final deprecated int MOTION_RANGE_X = 0; // 0x0 field public static final deprecated int MOTION_RANGE_Y = 1; // 0x1 field public static final int SOURCE_ANY = -256; // 0xffffff00 + field public static final int SOURCE_BLUETOOTH_STYLUS = 49154; // 0xc002 field public static final int SOURCE_CLASS_BUTTON = 1; // 0x1 field public static final int SOURCE_CLASS_JOYSTICK = 16; // 0x10 field public static final int SOURCE_CLASS_MASK = 255; // 0xff diff --git a/api/system-current.txt b/api/system-current.txt index a245a3e..63f9b74 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37081,6 +37081,7 @@ package android.view { field public static final deprecated int MOTION_RANGE_X = 0; // 0x0 field public static final deprecated int MOTION_RANGE_Y = 1; // 0x1 field public static final int SOURCE_ANY = -256; // 0xffffff00 + field public static final int SOURCE_BLUETOOTH_STYLUS = 49154; // 0xc002 field public static final int SOURCE_CLASS_BUTTON = 1; // 0x1 field public static final int SOURCE_CLASS_JOYSTICK = 16; // 0x10 field public static final int SOURCE_CLASS_MASK = 255; // 0xff |