am d21301e6: Cancelling the stateannouncer when entering button drop target
* commit 'd21301e674377ecd72bd14f32b52c68fabcfd3be':
Cancelling the stateannouncer when entering button drop target
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 56f209e..2a8567c 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -127,6 +127,9 @@
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 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);