diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 13:47:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 13:47:10 +0000 |
| commit | 3d5286983447262f12b78785391681b20a71f6b2 (patch) | |
| tree | 0be664eb2032c1240880ff6e6daa80ec4685eeb8 /api/system-current.txt | |
| parent | 07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b (diff) | |
| parent | 96238051621ba2dc8a1c20fa48a00ec6ec4735d6 (diff) | |
| download | frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.zip frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.tar.gz frameworks_base-3d5286983447262f12b78785391681b20a71f6b2.tar.bz2 | |
Merge "Revert "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, 1 insertions, 5 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index d7c95da..6cbd7d0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37625,7 +37625,6 @@ 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); @@ -37689,6 +37688,7 @@ 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,8 +37704,6 @@ 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 @@ -37774,8 +37772,6 @@ 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 |