diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-25 21:09:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 21:09:28 +0000 |
| commit | 1f604dfbc7a2ebe1bd04f9bce14a3b858f23a283 (patch) | |
| tree | c98d45e13d65e9a2558279abfd1835c6f859e5d8 /src/com/android | |
| parent | c5c723bbe43206ffa218b677984bc56a877359c4 (diff) | |
| parent | d21301e674377ecd72bd14f32b52c68fabcfd3be (diff) | |
| download | android_packages_apps_Trebuchet-1f604dfbc7a2ebe1bd04f9bce14a3b858f23a283.tar.gz android_packages_apps_Trebuchet-1f604dfbc7a2ebe1bd04f9bce14a3b858f23a283.tar.bz2 android_packages_apps_Trebuchet-1f604dfbc7a2ebe1bd04f9bce14a3b858f23a283.zip | |
am d21301e6: Cancelling the stateannouncer when entering button drop target
* commit 'd21301e674377ecd72bd14f32b52c68fabcfd3be':
Cancelling the stateannouncer when entering button drop target
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/accessibility/DragViewStateAnnouncer.java | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 56f209e8c..2a8567c4f 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -127,6 +127,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 b5e6194a0..8ff82dd4f 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); |