Merge "[Shell Transition]Fix live tile be hidden by wallpaper leash." into tm-qpr-dev (0dd24fc7) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -391,7 +391,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
		.withCornerRadius(getCurrentCornerRadius());

		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		builder.withLayer(mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
		builder.withLayer(mDrawsBelowRecents ? Integer.MIN_VALUE + 1 : Integer.MAX_VALUE);
		}
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -139,10 +139,12 @@ public class TransformParams {

		public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
		RemoteAnimationTargets targets = mTargetSet;
		SurfaceParams[] surfaceParams = new SurfaceParams[targets.unfilteredApps.length];
		final int appLength = targets.unfilteredApps.length;
		final int wallpaperLength = targets.wallpapers != null ? targets.wallpapers.length : 0;
		SurfaceParams[] surfaceParams = new SurfaceParams[appLength + wallpaperLength];
		mRecentsSurface = getRecentsSurface(targets);

		for (int i = 0; i < targets.unfilteredApps.length; i++) {
		for (int i = 0; i < appLength; i++) {
		RemoteAnimationTargetCompat app = targets.unfilteredApps[i];
		SurfaceParams.Builder builder = new SurfaceParams.Builder(app.leash);

		@@ -166,6 +168,12 @@ public class TransformParams {
		}
		surfaceParams[i] = builder.build();
		}
		// always put wallpaper layer to bottom.
		for (int i = 0; i < wallpaperLength; i++) {
		RemoteAnimationTargetCompat wallpaper = targets.wallpapers[i];
		surfaceParams[appLength + i] = new SurfaceParams.Builder(wallpaper.leash)
		.withLayer(Integer.MIN_VALUE).build();
		}
		return surfaceParams;
		}