Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef482dc authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 743c0eb6: am 9ea6343f: Merge "The active window for accessibility purposes... 

am 743c0eb6: am 9ea6343f: Merge "The active window for accessibility purposes can be miscomputed." into jb-mr1-dev

* commit '743c0eb6':
  The active window for accessibility purposes can be miscomputed.
parents c410e77c 743c0eb6

services/java/com/android/server/accessibility/AccessibilityManagerService.java

+15 −1
Original line number Diff line number Diff line
@@ -643,6 +643,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
        return mSecurityPolicy.mActiveWindowId;

    }



    void onTouchInteractionStart() {

        mSecurityPolicy.onTouchInteractionStart();

    }



    void onTouchInteractionEnd() {

        mSecurityPolicy.onTouchInteractionEnd();

    }
@@ -2138,6 +2142,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
            | AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED;



        private int mActiveWindowId;

        private boolean mTouchInteractionInProgress;



        private boolean canDispatchAccessibilityEvent(AccessibilityEvent event) {

            final int eventType = event.getEventType();
@@ -2185,12 +2190,21 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                    }

                } break;

                case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER: {

                    // Do not allow delayed hover events to confuse us

                    // which the active window is.

                    if (mTouchInteractionInProgress) {

                        mActiveWindowId = windowId;

                    }

                } break;

            }

        }



        public void onTouchInteractionStart() {

            mTouchInteractionInProgress = true;

        }



        public void onTouchInteractionEnd() {

            mTouchInteractionInProgress = false;

            // We want to set the active window to be current immediately

            // after the user has stopped touching the screen since if the

            // user types with the IME he should get a feedback for the

services/java/com/android/server/accessibility/TouchExplorer.java

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ class TouchExplorer implements EventStreamTransformation { 


        switch (event.getActionMasked()) {

            case MotionEvent.ACTION_DOWN:

                mAms.onTouchInteractionStart();

                // Pre-feed the motion events to the gesture detector since we

                // have a distance slop before getting into gesture detection

                // mode and not using the points within this slop significantly