diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-01 18:25:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-01 18:25:28 +0000 |
commit | 9ccacb544bfcb6b444edf09b1b37f955ae57168c (patch) | |
tree | 624efafb48bb0c5b8b0db7f0920fa1ddec2c0ade /src/com/android/launcher3 | |
parent | 2c4d2ccd90e60541efffb980b70270d0bfe4e585 (diff) | |
parent | 7aaa841c35d4a2adaa973f3c2b071608f062975b (diff) | |
download | android_packages_apps_Trebuchet-9ccacb544bfcb6b444edf09b1b37f955ae57168c.tar.gz android_packages_apps_Trebuchet-9ccacb544bfcb6b444edf09b1b37f955ae57168c.tar.bz2 android_packages_apps_Trebuchet-9ccacb544bfcb6b444edf09b1b37f955ae57168c.zip |
Merge "Fixing 'Item removed' announced twice when using accessible DnD" into ub-launcher3-burnaby-polish
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index e5bfe19c1..40a4678de 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -306,14 +306,10 @@ public abstract class ButtonDropTarget extends TextView setOnClickListener(enable ? this : null); } - protected String getAccessibilityDropConfirmation() { - return null; - } - @Override public void onClick(View v) { LauncherAppState.getInstance().getAccessibilityDelegate() - .handleAccessibleDrop(this, null, getAccessibilityDropConfirmation()); + .handleAccessibleDrop(this, null, null); } public int getTextColor() { diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 2a0e203e6..edaf525d6 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -125,9 +125,4 @@ public class DeleteDropTarget extends ButtonDropTarget { dragLayer.animateView(d.dragView, fling, duration, tInterpolator, onAnimationEndRunnable, DragLayer.ANIMATION_END_DISAPPEAR, null); } - - @Override - protected String getAccessibilityDropConfirmation() { - return getResources().getString(R.string.item_removed); - } } |