Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6aa31385: Merge "Remove accessibility gestures for clockwise and counter clock wise circle." into jb-dev

Browse Source 
* commit '6aa3138587198c6ddf529c0daee84eea6ea05549':
  Remove accessibility gestures for clockwise and counter clock wise circle.
This commit is contained in:
Svetoslav Ganov
2012-05-02 18:29:47 -07:00
committed by Android Git Automerger
parent a33d9a8a80 6aa3138587
commit 2d9ec6db45
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.txt
View File

@@ -2006,26 +2006,24 @@ package android.accessibilityservice {
method protected void onServiceConnected(); method protected void onServiceConnected();
method public final boolean performGlobalAction(int); method public final boolean performGlobalAction(int);
method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
field public static final int GESTURE_CLOCKWISE_CIRCLE = 9; // 0x9
field public static final int GESTURE_COUNTER_CLOCKWISE_CIRCLE = 10; // 0xa
field public static final int GESTURE_SWIPE_DOWN = 2; // 0x2 field public static final int GESTURE_SWIPE_DOWN = 2; // 0x2
field public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 17; // 0x11 field public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15; // 0xf
field public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 18; // 0x12 field public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16; // 0x10
field public static final int GESTURE_SWIPE_DOWN_AND_UP = 8; // 0x8 field public static final int GESTURE_SWIPE_DOWN_AND_UP = 8; // 0x8
field public static final int GESTURE_SWIPE_LEFT = 3; // 0x3 field public static final int GESTURE_SWIPE_LEFT = 3; // 0x3
field public static final int GESTURE_SWIPE_LEFT_AND_DOWN = 12; // 0xc field public static final int GESTURE_SWIPE_LEFT_AND_DOWN = 10; // 0xa
field public static final int GESTURE_SWIPE_LEFT_AND_RIGHT = 5; // 0x5 field public static final int GESTURE_SWIPE_LEFT_AND_RIGHT = 5; // 0x5
field public static final int GESTURE_SWIPE_LEFT_AND_UP = 11; // 0xb field public static final int GESTURE_SWIPE_LEFT_AND_UP = 9; // 0x9
field public static final int GESTURE_SWIPE_RIGHT = 4; // 0x4 field public static final int GESTURE_SWIPE_RIGHT = 4; // 0x4
field public static final int GESTURE_SWIPE_RIGHT_AND_DOWN = 14; // 0xe field public static final int GESTURE_SWIPE_RIGHT_AND_DOWN = 12; // 0xc
field public static final int GESTURE_SWIPE_RIGHT_AND_LEFT = 6; // 0x6 field public static final int GESTURE_SWIPE_RIGHT_AND_LEFT = 6; // 0x6
field public static final int GESTURE_SWIPE_RIGHT_AND_UP = 13; // 0xd field public static final int GESTURE_SWIPE_RIGHT_AND_UP = 11; // 0xb
field public static final int GESTURE_SWIPE_UP = 1; // 0x1 field public static final int GESTURE_SWIPE_UP = 1; // 0x1
field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7 field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7
field public static final int GESTURE_SWIPE_UP_AND_LEFT = 15; // 0xf field public static final int GESTURE_SWIPE_UP_AND_LEFT = 13; // 0xd
field public static final int GESTURE_SWIPE_UP_AND_RIGHT = 16; // 0x10 field public static final int GESTURE_SWIPE_UP_AND_RIGHT = 14; // 0xe
field public static final int GESTURE_TWO_FINGER_LONG_PRESS = 20; // 0x14 field public static final int GESTURE_TWO_FINGER_LONG_PRESS = 18; // 0x12
field public static final int GESTURE_TWO_FINGER_TAP = 19; // 0x13 field public static final int GESTURE_TWO_FINGER_TAP = 17; // 0x11
field public static final int GLOBAL_ACTION_BACK = 1; // 0x1 field public static final int GLOBAL_ACTION_BACK = 1; // 0x1
field public static final int GLOBAL_ACTION_HOME = 2; // 0x2 field public static final int GLOBAL_ACTION_HOME = 2; // 0x2
field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4 field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4

30
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -243,65 +243,55 @@ public abstract class AccessibilityService extends Service {
*/ */
public static final int GESTURE_SWIPE_DOWN_AND_UP = 8; public static final int GESTURE_SWIPE_DOWN_AND_UP = 8;
/**
* The user has performed a clockwise circle gesture on the touch screen.
*/
public static final int GESTURE_CLOCKWISE_CIRCLE = 9;
/**
* The user has performed a counter clockwise circle gesture on the touch screen.
*/
public static final int GESTURE_COUNTER_CLOCKWISE_CIRCLE = 10;
/** /**
* The user has performed a left and up gesture on the touch screen. * The user has performed a left and up gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_LEFT_AND_UP = 11; public static final int GESTURE_SWIPE_LEFT_AND_UP = 9;
/** /**
* The user has performed a left and down gesture on the touch screen. * The user has performed a left and down gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_LEFT_AND_DOWN = 12; public static final int GESTURE_SWIPE_LEFT_AND_DOWN = 10;
/** /**
* The user has performed a right and up gesture on the touch screen. * The user has performed a right and up gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_RIGHT_AND_UP = 13; public static final int GESTURE_SWIPE_RIGHT_AND_UP = 11;
/** /**
* The user has performed a right and down gesture on the touch screen. * The user has performed a right and down gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_RIGHT_AND_DOWN = 14; public static final int GESTURE_SWIPE_RIGHT_AND_DOWN = 12;
/** /**
* The user has performed an up and left gesture on the touch screen. * The user has performed an up and left gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_UP_AND_LEFT = 15; public static final int GESTURE_SWIPE_UP_AND_LEFT = 13;
/** /**
* The user has performed an up and right gesture on the touch screen. * The user has performed an up and right gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_UP_AND_RIGHT = 16; public static final int GESTURE_SWIPE_UP_AND_RIGHT = 14;
/** /**
* The user has performed an down and left gesture on the touch screen. * The user has performed an down and left gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 17; public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15;
/** /**
* The user has performed an down and right gesture on the touch screen. * The user has performed an down and right gesture on the touch screen.
*/ */
public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 18; public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16;
/** /**
* The user has performed a two finger tap gesture on the touch screen. * The user has performed a two finger tap gesture on the touch screen.
*/ */
public static final int GESTURE_TWO_FINGER_TAP = 19; public static final int GESTURE_TWO_FINGER_TAP = 17;
/** /**
* The user has performed a two finger long press gesture on the touch screen. * The user has performed a two finger long press gesture on the touch screen.
*/ */
public static final int GESTURE_TWO_FINGER_LONG_PRESS = 20; public static final int GESTURE_TWO_FINGER_LONG_PRESS = 18;
/** /**
* The {@link Intent} that must be declared as handled by the service. * The {@link Intent} that must be declared as handled by the service.