diff options
| author | Tony Wickham <twickham@google.com> | 2016-09-08 17:04:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-08 17:04:40 +0000 |
| commit | 285c76ddedadb6164f978fd23855d5168339aeb8 (patch) | |
| tree | b153e509e083c437bbc46de175510fa224f48ef1 /src/com/android/launcher3/dragndrop | |
| parent | 621ae5c2e6c039d2f4f01334bd0587e660e846e0 (diff) | |
| parent | 8dd5168b0582a20a4ede5ccfd21d227118fd9743 (diff) | |
| download | android_packages_apps_Trebuchet-285c76ddedadb6164f978fd23855d5168339aeb8.tar.gz android_packages_apps_Trebuchet-285c76ddedadb6164f978fd23855d5168339aeb8.tar.bz2 android_packages_apps_Trebuchet-285c76ddedadb6164f978fd23855d5168339aeb8.zip | |
Merge "Add outline to shortcuts when focused." into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 4 |
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 |