From fe304b893968887323b93764caafa66ee8ad44de Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Fri, 28 Sep 2012 11:12:34 -0700
Subject: [PATCH] Some accessibility events not sent from touch explorer if
 apps misbehave.

1. The touch explorer is relying on the hover exit accessibility event to be sent
   from the app's view tree before sending the exploration end and last touch
   accessibility events. However, if the app is buggy and does not send the hover
   exit event, then the interaction ending events are never sent. Now there is a
   timeout in which we wait for the hover exit accessibility event before sending
   the gesture end and last touch accessibility events. Hence, we are making a
   best effort to have a consistent event stream.

2. Sneaking in the new nine patch for the border around the magnified region
   since the current one is engineering art.

bug:7233616

Change-Id: Ie64f23659c25ab914565d50537b9a82bdc6a44a0
---
 .../magnified_region_frame.9.png              | Bin 0 -> 190 bytes
 .../magnified_region_frame.9.png              | Bin 0 -> 172 bytes
 .../magnified_region_frame.9.png              | Bin 741 -> 0 bytes
 .../magnified_region_frame.9.png              | Bin 0 -> 205 bytes
 .../server/accessibility/TouchExplorer.java   |  58 ++++++++++++++++++
 5 files changed, 58 insertions(+)
 create mode 100644 core/res/res/drawable-hdpi/magnified_region_frame.9.png
 create mode 100644 core/res/res/drawable-mdpi/magnified_region_frame.9.png
 delete mode 100644 core/res/res/drawable-nodpi/magnified_region_frame.9.png
 create mode 100644 core/res/res/drawable-xhdpi/magnified_region_frame.9.png

diff --git a/core/res/res/drawable-hdpi/magnified_region_frame.9.png b/core/res/res/drawable-hdpi/magnified_region_frame.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..29bdc42e820729327a0831ce4217b6c9a5958c61
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zbb>IW`N`93fr1I1E{-7*Q?~{j<ZN)@@qV(cpy!_0x$5XUy@ka``fmg|h8P57IA=I1
zaB^}zUee+ubS;hl56AA$OLTv}m5u8zeqpt3E7OXJPo|&m59DjV;kMmO-|4SZ^CX5(
fIV~q|@fWgRE0JDxZ&j=<&@Ki~S3j3^P6<r_smVa4

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/magnified_region_frame.9.png b/core/res/res/drawable-mdpi/magnified_region_frame.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a61cbea769b7390a1da587b707de54888e1e5997
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`7(o-U3d5>s1y5Aq%`;9!2cLVD@y^6rwJbA`1IN_7g62`uT1TCQ3=
zFE*|HS)*N^|Lwy!nXIgkB}=SD8*DN-_3GySaoNtoJn8JYJM#@6$gkNYo}a6D>M77<
N22WQ%mvv4FO#s{bHkbea

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-nodpi/magnified_region_frame.9.png b/core/res/res/drawable-nodpi/magnified_region_frame.9.png
deleted file mode 100644
index 4cadefbc0888a1166a356b6d73e79d1012b18f0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000~S001Hg1^@s6OntdY00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01Jr#01Jr$H_6Mb00007bV*G`2iyoB
z7cMQvlbTQf00L!6L_t(Y$Gum(j?+LCJ!i%VHIIfUU8Ma3Qt<~Q1tsD~_y$V8fQFia
zmFQ{r50F9?($S!8VB>ozJkE~o8OJfnUdf7`@yxmJdkl;dh3jNt{IK0ER%R1VcW2dc
zB%pn@>L-Bht37TKa3y$8m<jZRN>F<UC26%nem>h=*NU<Rs*cxdiAKWewU%-UzYc&!
z&j|mO04PzU2+)FB-{!L)p8%*hoJOoA{0wThjSu#KWZISOHR+(>6$!uHEmrf{2Cij9
zZ(MR<=`{+#6@c#mUe^B>nf*7}Y!Mh@D-!Cl`b7Y1NDdIwr`zjHf-%Ie9ovTd{WS-m
zWo7BT=MsP-Kz#oAAyo>@lt@Qjt=}gNap@uxd+N_dl&$LpJf9p~sWxEQ3>I}x)HsHx
zy7a%hnM=9h%oaAfR??+swh%{MdP%7P{X+vjsD-+`h25k{DH11+A5#KD4vtc}(IYLq
z*LR@L(+&zSpRrKK4sP$60C)u8dAN6drBQV2kOHI(h{B;3_TB-QhUee0Cj^mzt7!&k
z(+r>(0mQSe9#3WDas^Nu8q=bi6ciw9b$N@x6^*HQJtkG5J<6g9^(O<^%SB_YQ^3k|
zr0Ra?cv1^Q36KP6w<n*{Y1Bt4G9zwC3@cf^c{g_U2>|W(aq@*CIi7?iZlAQMVLva8
z-#a*hv||?D09t|pl+83zh;KbFJF%unP?AVCh%j;k_-$z{Bobg1^Kda@0!*+13B1n{
z);DP)JfCg8Zg&e$V(qAB2W{Lis$nKNN0p@<0JZl?_!5|S_jBzM!>RMRHumFkOcwtG
XhhYxbPD@uQ00000NkvXXu0mjf#t%H3

diff --git a/core/res/res/drawable-xhdpi/magnified_region_frame.9.png b/core/res/res/drawable-xhdpi/magnified_region_frame.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..424b3d97313adc9c161ca1549f5b494766503cd6
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLrmqPZ!4!jfqEtPVzPw@N5p;p3t+2^>Z1wmD_Uz{$D3QIw&+Qwb425
zwT5NV1c!BNG!{;9$$eZ9RetAHO6;b>@(+7AKHz$9oZC0MXU?&Pee2t<n>n3d9m>3k
ybLPYk<z06iems`x@14Rj;n~EOvnJ_3=REgEe)CzTa|S@G89ZJ6T-G@yGywo)?o1B=

literal 0
HcmV?d00001

diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java
index 542cc07a46a1f..3e9bef0cac558 100644
--- a/services/java/com/android/server/accessibility/TouchExplorer.java
+++ b/services/java/com/android/server/accessibility/TouchExplorer.java
@@ -102,6 +102,10 @@ class TouchExplorer implements EventStreamTransformation {
     // The timeout after which we are no longer trying to detect a gesture.
     private static final int EXIT_GESTURE_DETECTION_TIMEOUT = 2000;
 
+    // The timeout to send interaction end events in case we did not
+    // receive the expected hover exit event due to a misbehaving app.
+    private static final int SEND_INTERACTION_END_EVENTS_TIMEOUT = 200;
+
     // Temporary array for storing pointer IDs.
     private final int[] mTempPointerIds = new int[MAX_POINTER_COUNT];
 
@@ -135,6 +139,9 @@ class TouchExplorer implements EventStreamTransformation {
     // Command for delayed sending of a hover exit event.
     private final SendHoverDelayed mSendHoverExitDelayed;
 
+    // Command for delayed sending of interaction ending events.
+    private final SendInteractionEndEventsDelayed mSendInteractionEndEventsDelayed;
+
     // Command for delayed sending of a long press.
     private final PerformLongPressDelayed mPerformLongPressDelayed;
 
@@ -233,6 +240,7 @@ class TouchExplorer implements EventStreamTransformation {
         mGestureLibrary.load();
         mSendHoverEnterDelayed = new SendHoverDelayed(MotionEvent.ACTION_HOVER_ENTER, true);
         mSendHoverExitDelayed = new SendHoverDelayed(MotionEvent.ACTION_HOVER_EXIT, false);
+        mSendInteractionEndEventsDelayed = new SendInteractionEndEventsDelayed();
         mDoubleTapDetector = new DoubleTapDetector();
         final float density = context.getResources().getDisplayMetrics().density;
         mScaledMinPointerDistanceToUseMiddleLocation =
@@ -278,6 +286,7 @@ class TouchExplorer implements EventStreamTransformation {
         mSendHoverExitDelayed.remove();
         mPerformLongPressDelayed.remove();
         mExitGestureDetectionModeDelayed.remove();
+        mSendInteractionEndEventsDelayed.remove();
         // Reset the pointer trackers.
         mReceivedPointerTracker.clear();
         mInjectedPointerTracker.clear();
@@ -334,6 +343,7 @@ class TouchExplorer implements EventStreamTransformation {
         // last hover exit event.
         if (mTouchExplorationGestureEnded
                 && eventType == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT) {
+            mSendInteractionEndEventsDelayed.remove();
             mTouchExplorationGestureEnded = false;
             sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END);
         }
@@ -342,6 +352,7 @@ class TouchExplorer implements EventStreamTransformation {
         // last hover exit and the touch exploration gesture end events.
         if (mTouchInteractionEnded
                 && eventType == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT) {
+            mSendInteractionEndEventsDelayed.remove();
             mTouchInteractionEnded = false;
             sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
         }
@@ -416,6 +427,10 @@ class TouchExplorer implements EventStreamTransformation {
                             mSendHoverExitDelayed.remove();
                         }
 
+                        if (mSendInteractionEndEventsDelayed.isPending()) {
+                            mSendInteractionEndEventsDelayed.forceSendAndRemove();
+                        }
+
                         mPerformLongPressDelayed.remove();
 
                         // If we have the first tap schedule a long press and break
@@ -873,6 +888,9 @@ class TouchExplorer implements EventStreamTransformation {
             final int pointerIdBits = event.getPointerIdBits();
             mTouchExplorationGestureEnded = true;
             mTouchInteractionEnded = true;
+            if (!mSendInteractionEndEventsDelayed.isPending()) {
+                mSendInteractionEndEventsDelayed.post();
+            }
             sendMotionEvent(event, MotionEvent.ACTION_HOVER_EXIT, pointerIdBits, policyFlags);
         }
     }
@@ -1484,10 +1502,16 @@ class TouchExplorer implements EventStreamTransformation {
                 } else {
                     mTouchExplorationGestureEnded = true;
                     mTouchInteractionEnded = true;
+                    if (!mSendInteractionEndEventsDelayed.isPending()) {
+                        mSendInteractionEndEventsDelayed.post();
+                    }
                 }
             } else {
                 if (!mGestureStarted) {
                     mTouchInteractionEnded = true;
+                    if (!mSendInteractionEndEventsDelayed.isPending()) {
+                        mSendInteractionEndEventsDelayed.post();
+                    }
                 }
             }
             sendMotionEvent(mPrototype, mHoverAction, mPointerIdBits, mPolicyFlags);
@@ -1495,6 +1519,40 @@ class TouchExplorer implements EventStreamTransformation {
         }
     }
 
+    private class SendInteractionEndEventsDelayed implements Runnable {
+
+        public void remove() {
+            mHandler.removeCallbacks(this);
+        }
+
+        public void post() {
+            mHandler.postDelayed(this, SEND_INTERACTION_END_EVENTS_TIMEOUT);
+        }
+
+        public boolean isPending() {
+            return mHandler.hasCallbacks(this);
+        }
+
+        public void forceSendAndRemove() {
+            if (isPending()) {
+                run();
+                remove();
+            }
+        }
+
+        @Override
+        public void run() {
+            if (mTouchExplorationGestureEnded) {
+                mTouchExplorationGestureEnded = false;
+                sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END);
+            }
+            if (mTouchInteractionEnded) {
+                mTouchInteractionEnded = false;
+                sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
+            }
+        }
+    }
+
     @Override
     public String toString() {
         return LOG_TAG;