diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-17 22:21:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-17 22:21:03 +0000 |
| commit | 24200e2757323e6a138170138a204cadcb2bc51c (patch) | |
| tree | 355377d1a02955e95e46af198f12381023cb38e3 /quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | |
| parent | 95b81c3e55fac3f1fdbd62efae39a7f8cfc25af8 (diff) | |
| parent | 7886c56a575842d27f976afc65caddcce67f85ec (diff) | |
| download | android_packages_apps_Trebuchet-24200e2757323e6a138170138a204cadcb2bc51c.tar.gz android_packages_apps_Trebuchet-24200e2757323e6a138170138a204cadcb2bc51c.tar.bz2 android_packages_apps_Trebuchet-24200e2757323e6a138170138a204cadcb2bc51c.zip | |
Merge "Reapply recents attached state in createActivityController()" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index 817d64f02..90b55360e 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -184,6 +184,12 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe @Override public void createActivityController(long transitionLength) { createActivityControllerInternal(activity, fromState, transitionLength, callback); + // Creating the activity controller animation sometimes reapplies the launcher state + // (because we set the animation as the current state animation), so we reapply the + // attached state here as well to ensure recents is shown/hidden appropriately. + if (SysUINavigationMode.getMode(activity) == Mode.NO_BUTTON) { + setRecentsAttachedToAppWindow(mIsAttachedToWindow, false); + } } @Override |