From d21301e674377ecd72bd14f32b52c68fabcfd3be Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 25 Sep 2015 12:17:08 -0700
Subject: [PATCH] Cancelling the stateannouncer when entering button drop
 target

Change-Id: Ia10298e1d4862fc5f46894fa6d934207d6e9c117
---
 src/com/android/launcher3/ButtonDropTarget.java               | 3 +++
 .../launcher3/accessibility/DragViewStateAnnouncer.java       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 9caa7ad874..e5bfe19c1c 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -124,6 +124,9 @@ public abstract class ButtonDropTarget extends TextView
             mDrawable.setColorFilter(new ColorMatrixColorFilter(mCurrentFilter));
             setTextColor(mHoverColor);
         }
+        if (d.stateAnnouncer != null) {
+            d.stateAnnouncer.cancel();
+        }
         sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
     }
 
diff --git a/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java b/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
index b5e6194a06..8ff82dd4f8 100644
--- a/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
+++ b/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
@@ -41,6 +41,10 @@ public class DragViewStateAnnouncer implements Runnable {
         mTargetView.postDelayed(this, TIMEOUT_SEND_ACCESSIBILITY_EVENT);
     }
 
+    public void cancel() {
+        mTargetView.removeCallbacks(this);
+    }
+
     @Override
     public void run() {
         mTargetView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);