summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2019-04-05 13:52:35 -0700
committerTony Wickham <twickham@google.com>2019-04-09 10:53:24 -0700
commit9791bd1555b2143fcc39830cdc555aa51114f4b0 (patch)
tree4ccb461497a01766d21b339e0ecb72a9c7feff11 /src/com/android/launcher3/folder
parent2a059c7802c68ffbccbde00b6036b8cbd2b04a7d (diff)
downloadandroid_packages_apps_Trebuchet-9791bd1555b2143fcc39830cdc555aa51114f4b0.tar.gz
android_packages_apps_Trebuchet-9791bd1555b2143fcc39830cdc555aa51114f4b0.tar.bz2
android_packages_apps_Trebuchet-9791bd1555b2143fcc39830cdc555aa51114f4b0.zip
Swipe up on nav bar to go home from -1 and widgets
More specifically, any window (e.g. qsb search) or AbstractFloatingView. NavBarToHomeTouchController now implements TouchController directly instead of AbstractStateChangeTouchController, as it not only dealing with launcher states. This makes it easier to override intercept logic to handle cases like not having window focus, for example. AbstractFloatingViews can createHintCloseAnim() to play an animation hinting that it is about to be closed by swiping up. Widgets sheets use this to pull back similar to the all apps transition to home. Bug: 129976669 Change-Id: Ie157b978d9f1ee36d5fd32cea72ec02ce40878c0
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/Folder.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index bcddd037e..2ce663433 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -1406,7 +1406,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
@Override
public void logActionCommand(int command) {
mLauncher.getUserEventDispatcher().logActionCommand(
- command, getFolderIcon(), ContainerType.FOLDER);
+ command, getFolderIcon(), getLogContainerType());
+ }
+
+ @Override
+ public int getLogContainerType() {
+ return ContainerType.FOLDER;
}
@Override