Merge "Fix AlwaysOnTop stack may covered by RemoteAnimation" into ub-launcher3-rvc-dev (7e0a1ac6) · Commits · e / os / BlissLauncher3

quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ public class AppWindowAnimationHelper {
		float alpha;
		float cornerRadius = 0f;
		float scale = Math.max(mCurrentRect.width(), mTargetRect.width()) / crop.width();
		int layer = RemoteAnimationProvider.getLayer(app, mBoostModeTargetLayers);
		if (app.mode == params.mTargetSet.targetMode) {
		alpha = mTaskAlphaCallback.getAlpha(app, params.mTargetAlpha);
		if (app.activityType != RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
		@@ -245,13 +244,11 @@ public class AppWindowAnimationHelper {
		alpha = mBaseAlphaCallback.getAlpha(app, progress);
		if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.mLauncherOnTop) {
		crop = null;
		layer = Integer.MAX_VALUE;
		}
		}
		builder.withAlpha(alpha)
		.withMatrix(mTmpMatrix)
		.withWindowCrop(crop)
		.withLayer(layer)
		// Since radius is in Surface space, but we draw the rounded corners in screen
		// space, we have to undo the scale
		.withCornerRadius(cornerRadius / scale);

+0 −3

Original line number	Diff line number	Diff line
		@@ -611,7 +611,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		.withWindowCrop(target.screenSpaceBounds)
		.withAlpha(1f);
		}
		builder.withLayer(RemoteAnimationProvider.getLayer(target, MODE_OPENING));
		params[i] = builder.build();
		}
		surfaceApplier.scheduleApply(params);
		@@ -718,7 +717,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		params[i] = new SurfaceParams.Builder(target.leash)
		.withAlpha(1f)
		.withWindowCrop(target.screenSpaceBounds)
		.withLayer(RemoteAnimationProvider.getLayer(target, MODE_OPENING))
		.withCornerRadius(cornerRadius)
		.build();
		}
		@@ -775,7 +773,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
		}
		params[i] = builder
		.withWindowCrop(target.screenSpaceBounds)
		.withLayer(RemoteAnimationProvider.getLayer(target, MODE_CLOSING))
		.build();
		}
		surfaceApplier.scheduleApply(params);

+1 −4

Original line number	Diff line number	Diff line
		@@ -62,15 +62,12 @@ public abstract class RemoteAnimationProvider {
		static void prepareTargetsForFirstFrame(RemoteAnimationTargetCompat[] targets,
		TransactionCompat t, int boostModeTargets) {
		for (RemoteAnimationTargetCompat target : targets) {
		t.setLayer(target.leash, getLayer(target, boostModeTargets));
		t.show(target.leash);
		}
		}

		public static int getLayer(RemoteAnimationTargetCompat target, int boostModeTarget) {
		return target.mode == boostModeTarget
		? Z_BOOST_BASE + target.prefixOrderIndex
		: target.prefixOrderIndex;
		return target.prefixOrderIndex;
		}

		/**