Merge "Revert "Completely destroy Launcher's Taskbar."" into main (3ad18b45) · Commits · e / os / android_packages_apps_Trebuchet

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -648,7 +648,8 @@ public class TaskbarManager {
		}
		}

		private void addTaskbarRootViewToWindow() {
		@VisibleForTesting
		public void addTaskbarRootViewToWindow() {
		if (enableTaskbarNoRecreate() && !mAddedWindow && mTaskbarActivityContext != null) {
		mWindowManager.addView(mTaskbarRootLayout,
		mTaskbarActivityContext.getWindowLayoutParams());
		@@ -656,7 +657,8 @@ public class TaskbarManager {
		}
		}

		private void removeTaskbarRootViewFromWindow() {
		@VisibleForTesting
		public void removeTaskbarRootViewFromWindow() {
		if (enableTaskbarNoRecreate() && mAddedWindow) {
		mWindowManager.removeViewImmediate(mTaskbarRootLayout);
		mAddedWindow = false;

+6 −2

Original line number	Diff line number	Diff line
		@@ -119,14 +119,18 @@ class TaskbarUnitTestRule(
		try {
		// Replace Launcher Taskbar window with test instance.
		instrumentation.runOnMainSync {
		launcherTaskbarManager?.destroy()
		launcherTaskbarManager?.removeTaskbarRootViewFromWindow()
		taskbarManager.onUserUnlocked() // Required to complete initialization.
		}

		injectControllers()
		base.evaluate()
		} finally {
		instrumentation.runOnMainSync { taskbarManager.destroy() }
		// Revert Taskbar window.
		instrumentation.runOnMainSync {
		taskbarManager.destroy()
		launcherTaskbarManager?.addTaskbarRootViewToWindow()
		}
		}
		}
		}