diff options
author | James O'Leary <jamesoleary@google.com> | 2019-07-25 13:57:54 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 13:57:54 -0700 |
commit | b1d239405fd2432d6db5df93c4fbb7e59bfc494d (patch) | |
tree | 9b99776e7a15ae95fc89555c4ec06debe850ac82 /quickstep/src | |
parent | 46d0c36cc61240daab5fce54f3cb0727503b7e31 (diff) | |
parent | 93dceb8a48eee7f9daf1a7799de10305d839431c (diff) | |
download | android_packages_apps_Trebuchet-b1d239405fd2432d6db5df93c4fbb7e59bfc494d.tar.gz android_packages_apps_Trebuchet-b1d239405fd2432d6db5df93c4fbb7e59bfc494d.tar.bz2 android_packages_apps_Trebuchet-b1d239405fd2432d6db5df93c4fbb7e59bfc494d.zip |
Merge "Fix QSB becoming invisible" into ub-launcher3-qt-r1-dev
am: 93dceb8a48
Change-Id: Id0a72f39d828535f177992fdf2c674cc84c5a629
Diffstat (limited to 'quickstep/src')
-rw-r--r-- | quickstep/src/com/android/quickstep/OverviewComponentObserver.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index 4a2ed3a3d..88a4eb6d1 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -116,6 +116,14 @@ public final class OverviewComponentObserver { .getHomeActivities(new ArrayList<>()); mIsDefaultHome = Objects.equals(mMyHomeIntent.getComponent(), defaultHome); + + // Set assistant visibility to 0 from launcher's perspective, ensures any elements that + // launcher made invisible become visible again before the new activity control helper + // becomes active. + if (mActivityControlHelper != null) { + mActivityControlHelper.onAssistantVisibilityChanged(0.f); + } + if ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 && (defaultHome == null || mIsDefaultHome)) { // User default home is same as out home app. Use Overview integrated in Launcher. @@ -131,6 +139,7 @@ public final class OverviewComponentObserver { } } else { // The default home app is a different launcher. Use the fallback Overview instead. + mActivityControlHelper = new FallbackActivityControllerHelper(); mIsHomeAndOverviewSame = false; mOverviewIntent = mFallbackIntent; |