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

am cc822a76: Merge "Touch exploration gesture end not delivered to clients." into jb-dev

Browse Source 
* commit 'cc822a769e752c2845dc795f05b7b35b5b3f6614':
  Touch exploration gesture end not delivered to clients.
This commit is contained in:
Svetoslav Ganov
2012-06-03 20:32:43 -07:00
committed by Android Git Automerger
parent b59d061861 cc822a769e
commit 66a10964b0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -384,9 +384,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
}
public boolean sendAccessibilityEvent(AccessibilityEvent event) {
final int eventType = event.getEventType();
// The event for gesture start should be strictly before the
// first hover enter event for the gesture.
if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_HOVER_ENTER
if (eventType == AccessibilityEvent.TYPE_VIEW_HOVER_ENTER
&& mTouchExplorationGestureStarted) {
mTouchExplorationGestureStarted = false;
AccessibilityEvent gestureStartEvent = AccessibilityEvent.obtain(
@@ -400,11 +402,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
notifyAccessibilityServicesDelayedLocked(event, false);
notifyAccessibilityServicesDelayedLocked(event, true);
}
event.recycle();
mHandledFeedbackTypes = 0;
}
// The event for gesture end should be strictly after the
// last hover exit event for the gesture.
if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT
if (eventType == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT
&& mTouchExplorationGestureEnded) {
mTouchExplorationGestureEnded = false;
AccessibilityEvent gestureEndEvent = AccessibilityEvent.obtain(
@@ -412,9 +417,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
sendAccessibilityEvent(gestureEndEvent);
}
event.recycle();
mHandledFeedbackTypes = 0;
return (OWN_PROCESS_ID != Binder.getCallingPid());
}