diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 13:31:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 13:31:29 +0000 |
| commit | 07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b (patch) | |
| tree | 057cd12608c83a809c155a1b3b7469f39b2e26ef /api/system-current.txt | |
| parent | be752b1f28f1f3724b235e3f0a77b4c07c40e631 (diff) | |
| parent | ec0ce51b733f10c620cb9447b074f022d042e31d (diff) | |
| download | frameworks_base-07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b.zip frameworks_base-07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b.tar.gz frameworks_base-07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b.tar.bz2 | |
Merge "Add new MotionEvent actions for button press and release." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6cbd7d0..d7c95da 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37625,6 +37625,7 @@ package android.view { method public static java.lang.String axisToString(int); method public final int findPointerIndex(int); method public final int getAction(); + method public final int getActionButton(); method public final int getActionIndex(); method public final int getActionMasked(); method public final float getAxisValue(int); @@ -37688,7 +37689,6 @@ package android.view { method public final float getY(int); method public final float getYPrecision(); method public final boolean isButtonPressed(int); - method public final boolean isStylusButtonPressed(); method public static android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int); method public static deprecated android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int); method public static android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int); @@ -37704,6 +37704,8 @@ package android.view { method public final void setSource(int); method public final void transform(android.graphics.Matrix); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACTION_BUTTON_PRESS = 11; // 0xb + field public static final int ACTION_BUTTON_RELEASE = 12; // 0xc field public static final int ACTION_CANCEL = 3; // 0x3 field public static final int ACTION_DOWN = 0; // 0x0 field public static final int ACTION_HOVER_ENTER = 9; // 0x9 @@ -37772,6 +37774,8 @@ package android.view { field public static final int BUTTON_FORWARD = 16; // 0x10 field public static final int BUTTON_PRIMARY = 1; // 0x1 field public static final int BUTTON_SECONDARY = 2; // 0x2 + field public static final int BUTTON_STYLUS_PRIMARY = 32; // 0x20 + field public static final int BUTTON_STYLUS_SECONDARY = 64; // 0x40 field public static final int BUTTON_TERTIARY = 4; // 0x4 field public static final android.os.Parcelable.Creator<android.view.MotionEvent> CREATOR; field public static final int EDGE_BOTTOM = 2; // 0x2 |