Merge "Fix QSB becoming invisible" into ub-launcher3-qt-r1-dev (93dceb8a) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,9 @@ public final class FallbackActivityControllerHelper implements

		@Override
		public void onAssistantVisibilityChanged(float visibility) {
		// TODO:
		// This class becomes active when the screen is locked.
		// Rather than having it handle assistant visibility changes, the assistant visibility is
		// set to zero prior to this class becoming active.
		}

		@NonNull

+9 −0

Original line number	Diff line number	Diff line
		@@ -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;