summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dragndrop/DragLayer.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-08-31 13:30:27 -0700
committerTony Wickham <twickham@google.com>2016-09-07 18:20:21 -0700
commit8dd5168b0582a20a4ede5ccfd21d227118fd9743 (patch)
tree4491743789b2b7f2c9eb2487ff0b3e50ce0d7e70 /src/com/android/launcher3/dragndrop/DragLayer.java
parent9b7149db401959f0c3fc5f6bcb46c5d424858955 (diff)
downloadandroid_packages_apps_Trebuchet-8dd5168b0582a20a4ede5ccfd21d227118fd9743.tar.gz
android_packages_apps_Trebuchet-8dd5168b0582a20a4ede5ccfd21d227118fd9743.tar.bz2
android_packages_apps_Trebuchet-8dd5168b0582a20a4ede5ccfd21d227118fd9743.zip
Add outline to shortcuts when focused.
Bug: 30563273 Change-Id: Ia54c112dcf91c225588b7388001eb93ee5c03171
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragLayer.java')
-rw-r--r--src/com/android/launcher3/dragndrop/DragLayer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index e5ec6ba9f..58638288e 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -506,7 +506,9 @@ public class DragLayer extends InsettableFrameLayout {
@Override
public boolean dispatchUnhandledMove(View focused, int direction) {
- return mDragController.dispatchUnhandledMove(focused, direction);
+ // Consume the unhandled move if a container is open, to avoid switching pages underneath.
+ boolean isContainerOpen = mLauncher.getTopFloatingView() != null;
+ return isContainerOpen || mDragController.dispatchUnhandledMove(focused, direction);
}
@Override