Merge "Maintain fixed-rotation illusion for wallpapers in transition" into main (4a749136) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Transition.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -1694,7 +1694,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// ActivityRecord#canShowWindows() may reject to show its window. The visibility also
		// needs to be updated for STATE_ABORT.
		commitVisibleActivities(transaction);
		commitVisibleWallpapers();
		commitVisibleWallpapers(transaction);

		if (mTransactionCompletedListeners != null) {
		for (int i = 0; i < mTransactionCompletedListeners.size(); i++) {
		@@ -2128,7 +2128,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		/**
		* Reset waitingToshow for all wallpapers, and commit the visibility of the visible ones
		*/
		private void commitVisibleWallpapers() {
		private void commitVisibleWallpapers(SurfaceControl.Transaction t) {
		boolean showWallpaper = shouldWallpaperBeVisible();
		for (int i = mParticipants.size() - 1; i >= 0; --i) {
		final WallpaperWindowToken wallpaper = mParticipants.valueAt(i).asWallpaperToken();
		@@ -2136,6 +2136,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		if (!wallpaper.isVisible() && wallpaper.isVisibleRequested()) {
		wallpaper.commitVisibility(showWallpaper);
		}
		if (showWallpaper && Flags.ensureWallpaperInTransitions()
		&& wallpaper.isVisibleRequested()
		&& getLeashSurface(wallpaper, t) != wallpaper.getSurfaceControl()) {
		// If on a rotation leash, we need to explicitly show the wallpaper surface
		// because shell only gets the leash and we don't allow non-transition logic
		// to touch the surfaces until the transition is over.
		t.show(wallpaper.getSurfaceControl());
		}
		}
		}
		}
		@@ -2837,6 +2845,13 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// Use parent rotation because shell doesn't know the surface is rotated.
		endRotation = parent.getWindowConfiguration().getRotation();
		}
		} else if (isWallpaper(target) && Flags.ensureWallpaperInTransitions()
		&& target.getRelativeDisplayRotation() != 0
		&& !target.mTransitionController.useShellTransitionsRotation()) {
		// If the wallpaper is "fixed-rotated", shell is unaware of this, so use the
		// "as-if-not-rotating" bounds and rotation
		change.setEndAbsBounds(parent.getBounds());
		endRotation = parent.getWindowConfiguration().getRotation();
		} else {
		change.setEndAbsBounds(bounds);
		}