Merge "Fix Taskbar being visible over Hotseat when recreated in Overview" into main (3a477596) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ public class TaskbarLauncherStateController {
		private MultiProperty mIconAlphaForHome;
		private QuickstepLauncher mLauncher;

		private boolean mIsDestroyed = false;
		private Integer mPrevState;
		private int mState;
		private LauncherState mLauncherState = LauncherState.NORMAL;
		@@ -256,6 +257,7 @@ public class TaskbarLauncherStateController {
		}

		public void onDestroy() {
		mIsDestroyed = true;
		mCanSyncViews = false;

		mIconAlignment.finishAnimation();
		@@ -407,7 +409,7 @@ public class TaskbarLauncherStateController {
		}

		public Animator applyState(long duration, boolean start) {
		if (mControllers.taskbarActivityContext.isDestroyed()) {
		if (mIsDestroyed) {
		return null;
		}
		Animator animator = null;
		@@ -753,7 +755,7 @@ public class TaskbarLauncherStateController {
		}

		private void updateIconAlphaForHome(float alpha) {
		if (mControllers.taskbarActivityContext.isDestroyed()) {
		if (mIsDestroyed) {
		return;
		}
		mIconAlphaForHome.setValue(alpha);

+0 −1

Original line number	Diff line number	Diff line
		@@ -1005,7 +1005,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		"ALPHA_INDEX_RECENTS_DISABLED",
		"ALPHA_INDEX_NOTIFICATION_EXPANDED",
		"ALPHA_INDEX_ASSISTANT_INVOKED",
		"ALPHA_INDEX_IME_BUTTON_NAV",
		"ALPHA_INDEX_SMALL_SCREEN");

		mModelCallbacks.dumpLogs(prefix + "\t", pw);

+0 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static org.junit.Assume.assumeTrue;
		import android.content.Intent;
		import android.platform.test.annotations.PlatinumTest;

		import androidx.test.filters.FlakyTest;
		import androidx.test.platform.app.InstrumentationRegistry;

		import com.android.launcher3.Launcher;
		@@ -33,7 +32,6 @@ import com.android.launcher3.LauncherState;
		import com.android.launcher3.tapl.AllApps;
		import com.android.launcher3.ui.AbstractLauncherUiTest;
		import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;
		import com.android.launcher3.util.rule.ScreenRecordRule;

		import org.junit.Test;

		@@ -191,7 +189,6 @@ public class TaplOpenCloseAllAppsTest extends AbstractLauncherUiTest<Launcher> {
		/**
		* Makes sure that when pressing back when AllApps is open we go back to the Home screen.
		*/
		@FlakyTest(bugId = 256615483)
		@Test
		@PortraitLandscape
		public void testPressBackFromAllAppsToHome() {