Merge cherrypicks of ['googleplex-android-review.googlesource.com/23909000',... (ba3ae8d5) · Commits · e / os / BlissLauncher3

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import com.android.quickstep.util.GroupTask;
		import com.android.quickstep.views.RecentsView;

		import java.io.PrintWriter;
		import java.util.Arrays;

		/**
		* A data source which integrates with a Launcher instance
		@@ -105,6 +106,10 @@ public class LauncherTaskbarUIController extends TaskbarUIController {

		// Restore the in-app display progress from before Taskbar was recreated.
		float[] prevProgresses = mControllers.getSharedState().inAppDisplayProgressMultiPropValues;
		// Make a copy of the previous progress to set since updating the multiprop will update
		// the property which also calls onInAppDisplayProgressChanged() which writes the current
		// values into the shared state
		prevProgresses = Arrays.copyOf(prevProgresses, prevProgresses.length);
		for (int i = 0; i < prevProgresses.length; i++) {
		mTaskbarInAppDisplayProgressMultiProp.get(i).setValue(prevProgresses[i]);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -923,6 +923,15 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION);
		}

		/**
		* Called whenever a new ui controller is set, and should update anything that depends on the
		* ui controller.
		*/
		public void onUiControllerChanged() {
		updateNavButtonInAppDisplayProgressForSysui();
		updateNavButtonTranslationY();
		}

		@Override
		public void dumpLogs(String prefix, PrintWriter pw) {
		pw.println(prefix + "NavbarButtonsViewController:");

+1 −3

Original line number	Diff line number	Diff line
		@@ -591,9 +591,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		* Sets a new data-source for this taskbar instance
		*/
		public void setUIController(@NonNull TaskbarUIController uiController) {
		mControllers.uiController.onDestroy();
		mControllers.uiController = uiController;
		mControllers.uiController.init(mControllers);
		mControllers.setUiController(uiController);
		}

		/**

+13 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,19 @@ public class TaskbarControllers {
		mPostInitCallbacks.clear();
		}

		/**
		* Sets the ui controller.
		*/
		public void setUiController(@NonNull TaskbarUIController newUiController) {
		uiController.onDestroy();
		uiController = newUiController;
		uiController.init(this);
		uiController.updateStateForSysuiFlags(mSharedState.sysuiStateFlags);

		// Notify that the ui controller has changed
		navbarButtonsViewController.onUiControllerChanged();
		}

		@Nullable
		public TaskbarSharedState getSharedState() {
		// This should only be null if called before init() and after destroy().

+16 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.quickstep;

		import static android.view.RemoteAnimationTarget.MODE_CLOSING;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		@@ -37,6 +38,7 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
		import com.android.systemui.shared.system.RecentsAnimationControllerCompat;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.Set;

		@@ -101,9 +103,22 @@ public class RecentsAnimationCallbacks implements
		RemoteAnimationTarget[] appTargets,
		RemoteAnimationTarget[] wallpaperTargets,
		Rect homeContentInsets, Rect minimizedHomeBounds) {
		long appCount = Arrays.stream(appTargets)
		.filter(app -> app.mode == MODE_CLOSING)
		.count();
		if (appCount == 0) {
		// Edge case, if there are no closing app targets, then Launcher has nothing to handle
		ActiveGestureLog.INSTANCE.addLog(
		/* event= */ "RecentsAnimationCallbacks.onAnimationStart (canceled)",
		/* extras= */ 0,
		/* gestureEvent= */ START_RECENTS_ANIMATION);
		notifyAnimationCanceled();
		animationController.finish(false /* toHome /, false / sendUserLeaveHint */);
		return;
		}

		mController = new RecentsAnimationController(animationController,
		mAllowMinimizeSplitScreen, this::onAnimationFinished);

		if (mCancelled) {
		Utilities.postAsyncCallback(MAIN_EXECUTOR.getHandler(),
		mController::finishAnimationToApp);