summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/popup
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2019-04-09 18:14:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-09 18:14:15 +0000
commit5e29395eba591d181de8150b91d79328eaf550d4 (patch)
tree1d0db46f54f58992a8c7490a27798655804a1c0e /src/com/android/launcher3/popup
parentdeb7cd54e738d1a3476621425a6894910417354e (diff)
parent9791bd1555b2143fcc39830cdc555aa51114f4b0 (diff)
downloadandroid_packages_apps_Trebuchet-5e29395eba591d181de8150b91d79328eaf550d4.tar.gz
android_packages_apps_Trebuchet-5e29395eba591d181de8150b91d79328eaf550d4.tar.bz2
android_packages_apps_Trebuchet-5e29395eba591d181de8150b91d79328eaf550d4.zip
Merge "Swipe up on nav bar to go home from -1 and widgets" into ub-launcher3-qt-dev
Diffstat (limited to 'src/com/android/launcher3/popup')
-rw-r--r--src/com/android/launcher3/popup/PopupContainerWithArrow.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 080a0cb69..593dbd46c 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -157,7 +157,12 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
@Override
public void logActionCommand(int command) {
mLauncher.getUserEventDispatcher().logActionCommand(
- command, mOriginalIcon, ContainerType.DEEPSHORTCUTS);
+ command, mOriginalIcon, getLogContainerType());
+ }
+
+ @Override
+ public int getLogContainerType() {
+ return ContainerType.DEEPSHORTCUTS;
}
public OnClickListener getItemClickListener() {