diff options
| author | Tony <twickham@google.com> | 2019-03-13 10:12:01 -0500 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2019-03-15 17:08:51 -0500 |
| commit | d5a3df7b8362b0dd310559877b78dc642c27e014 (patch) | |
| tree | e9fe0380bc2d77e17b702915e03714a0394934ee /src/com/android/launcher3/popup/PopupContainerWithArrow.java | |
| parent | d082129ef816884f2658c362215c66a35704a3f3 (diff) | |
| download | android_packages_apps_Trebuchet-d5a3df7b8362b0dd310559877b78dc642c27e014.tar.gz android_packages_apps_Trebuchet-d5a3df7b8362b0dd310559877b78dc642c27e014.tar.bz2 android_packages_apps_Trebuchet-d5a3df7b8362b0dd310559877b78dc642c27e014.zip | |
Don't close popup container if touch came from nav bar
Moved EDGE_NAV_BAR from quickstep package to launcher3
Bug: 127917144
Change-Id: Ic619ea49896ca8e49a9a539b7dc7d682291241b7
Diffstat (limited to 'src/com/android/launcher3/popup/PopupContainerWithArrow.java')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index b0af4c678..10ecc4f04 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -22,6 +22,7 @@ import static com.android.launcher3.popup.PopupPopulator.MAX_SHORTCUTS_IF_NOTIFI import static com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import static com.android.launcher3.userevent.nano.LauncherLogProto.ItemType; import static com.android.launcher3.userevent.nano.LauncherLogProto.Target; +import static com.android.launcher3.Utilities.EDGE_NAV_BAR; import android.animation.AnimatorSet; import android.animation.LayoutTransition; @@ -167,7 +168,8 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource, public boolean onControllerInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { BaseDragLayer dl = getPopupContainer(); - if (!dl.isEventOverView(this, ev)) { + final boolean cameFromNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0; + if (!cameFromNavBar && !dl.isEventOverView(this, ev)) { mLauncher.getUserEventDispatcher().logActionTapOutside( LoggerUtils.newContainerTarget(ContainerType.DEEPSHORTCUTS)); close(true); |