diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-20 20:16:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-20 20:16:47 +0000 |
| commit | 2445ca07772bed59eeb1ac23499efc487fda1ca1 (patch) | |
| tree | eb8bdbdec25c2bfd4279e27f6a72f02f47b79d41 | |
| parent | 692b5a26d9498c7eb836789c057b9bc2f1fd6f92 (diff) | |
| parent | e543818bb61246f5eae3159104134b193431ec85 (diff) | |
| download | android_packages_apps_Trebuchet-2445ca07772bed59eeb1ac23499efc487fda1ca1.tar.gz android_packages_apps_Trebuchet-2445ca07772bed59eeb1ac23499efc487fda1ca1.tar.bz2 android_packages_apps_Trebuchet-2445ca07772bed59eeb1ac23499efc487fda1ca1.zip | |
Merge "Fix bug where FolderIcon stays visible during swipe up to home animation." into ub-launcher3-qt-dev
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index f429ce5b0..a662d7433 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; +import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.Launcher; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.userevent.nano.LauncherLogProto; @@ -42,6 +43,13 @@ public class BackgroundAppState extends OverviewState { } @Override + public void onStateEnabled(Launcher launcher) { + RecentsView rv = launcher.getOverviewPanel(); + rv.setOverviewStateEnabled(true); + AbstractFloatingView.closeAllOpenViews(launcher, false); + } + + @Override public float getVerticalProgress(Launcher launcher) { if (launcher.getDeviceProfile().isVerticalBarLayout()) { return super.getVerticalProgress(launcher); diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 389e85269..2ef6d707e 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -593,6 +593,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo protected void handleClose(boolean animate) { mIsOpen = false; + if (!animate && mCurrentAnimator != null && mCurrentAnimator.isRunning()) { + mCurrentAnimator.cancel(); + } + if (isEditingName()) { mFolderName.dispatchBackKey(); } |