summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-27 15:54:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-27 15:54:41 -0700
commitbe922d6006879692d100894dc924d947b50aed34 (patch)
treedf408add89e3ac249ec41d5de504f93042e6cb1e /api
parent388432ac4326fc16e69f45784ee76aa1a6260272 (diff)
parent49754db5a304d995c1cc108ff6f19e4ba4265572 (diff)
downloadframeworks_base-be922d6006879692d100894dc924d947b50aed34.zip
frameworks_base-be922d6006879692d100894dc924d947b50aed34.tar.gz
frameworks_base-be922d6006879692d100894dc924d947b50aed34.tar.bz2
Merge "Handle stylus buttons and tool types."
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 815fec8..543c8bb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21938,9 +21938,8 @@ package android.view {
field public static final int EDGE_TOP = 1; // 0x1
field public static final int FLAG_WINDOW_IS_OBSCURED = 1; // 0x1
field public static final int INVALID_POINTER_ID = -1; // 0xffffffff
+ field public static final int TOOL_TYPE_ERASER = 4; // 0x4
field public static final int TOOL_TYPE_FINGER = 1; // 0x1
- field public static final int TOOL_TYPE_INDIRECT_FINGER = 4; // 0x4
- field public static final int TOOL_TYPE_INDIRECT_STYLUS = 5; // 0x5
field public static final int TOOL_TYPE_MOUSE = 3; // 0x3
field public static final int TOOL_TYPE_STYLUS = 2; // 0x2
field public static final int TOOL_TYPE_UNKNOWN = 0; // 0x0