commit d21301e674377ecd72bd14f32b52c68fabcfd3be
author Sunny Goyal <sunnygoyal@google.com> Fri Sep 25 12:17:08 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Sep 25 12:17:08 2015 -0700
tree e8f9fac165df9f4b23a4e1b849bfcd918085867b
parent e78e3d734b577c1ab6dc0738a83600374908ea52

Cancelling the stateannouncer when entering button drop target

Change-Id: Ia10298e1d4862fc5f46894fa6d934207d6e9c117

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 9caa7ad..e5bfe19 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -124,6 +124,9 @@
             mDrawable.setColorFilter(new ColorMatrixColorFilter(mCurrentFilter));
             setTextColor(mHoverColor);
         }
+        if (d.stateAnnouncer != null) {
+            d.stateAnnouncer.cancel();
+        }
         sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
     }
 

src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java

diff --git a/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java b/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
index b5e6194..8ff82dd 100644
--- a/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
+++ b/src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java
@@ -41,6 +41,10 @@
         mTargetView.postDelayed(this, TIMEOUT_SEND_ACCESSIBILITY_EVENT);
     }
 
+    public void cancel() {
+        mTargetView.removeCallbacks(this);
+    }
+
     @Override
     public void run() {
         mTargetView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);