Snap for 11975806 from ff83f1c4487566f8881b51f790ece993d99dc6f9 to 24Q3-release (788419ee) · Commits · e / os / android_packages_apps_Trebuchet

aconfig/launcher.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,13 @@ flag {
		bug: "296231746"
		}

		flag {
		name: "enable_taskbar_customization"
		namespace: "launcher"
		description: "Enables taskbar customization framework."
		bug: "347281365"
		}

		flag {
		name: "enable_unfolded_two_pane_picker"
		namespace: "launcher"

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate
		import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController
		import com.android.launcher3.testing.shared.ResourceUtils
		import com.android.launcher3.util.DisplayController
		import com.android.launcher3.util.Executors
		import java.io.PrintWriter
		import kotlin.jvm.optionals.getOrNull
		import kotlin.math.max
		@@ -76,6 +77,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas
		private val gestureNavSettingsObserver =
		GestureNavigationSettingsObserver(
		context.mainThreadHandler,
		Executors.UI_HELPER_EXECUTOR.handler,
		context,
		this::onTaskbarOrBubblebarWindowHeightOrInsetsChanged
		)

quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {

		private static final float END_PROGRESS = 1.0f;

		private static final float PIP_ASPECT_RATIO_MISMATCH_THRESHOLD = 0.01f;

		private final int mTaskId;
		private final ActivityInfo mActivityInfo;
		private final SurfaceControl mLeash;
		@@ -135,6 +137,7 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
		mDestinationBoundsTransformed.set(destinationBoundsTransformed);
		mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius, shadowRadius);

		final float aspectRatio = destinationBounds.width() / (float) destinationBounds.height();
		String reasonForCreateOverlay = null; // For debugging purpose.
		if (sourceRectHint.isEmpty()) {
		reasonForCreateOverlay = "Source rect hint is empty";
		@@ -149,15 +152,20 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
		} else if (!appBounds.contains(sourceRectHint)) {
		// This is a situation in which the source hint rect is outside the app bounds, so it is
		// not a valid rectangle to use for cropping app surface
		sourceRectHint.setEmpty();
		reasonForCreateOverlay = "Source rect hint exceeds display bounds " + sourceRectHint;
		sourceRectHint.setEmpty();
		} else if (Math.abs(
		aspectRatio - (sourceRectHint.width() / (float) sourceRectHint.height()))
		> PIP_ASPECT_RATIO_MISMATCH_THRESHOLD) {
		// The source rect hint does not aspect ratio
		reasonForCreateOverlay = "Source rect hint does not match aspect ratio "
		+ sourceRectHint + " aspect ratio " + aspectRatio;
		sourceRectHint.setEmpty();
		}

		if (sourceRectHint.isEmpty()) {
		// Crop a Rect matches the aspect ratio and pivots at the center point.
		// To make the animation path simplified.
		final float aspectRatio = destinationBounds.width()
		/ (float) destinationBounds.height();
		if ((appBounds.width() / (float) appBounds.height()) > aspectRatio) {
		// use the full height.
		mSourceRectHint.set(0, 0,