Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary wallpaper adjustment on transition" into tm-qpr-dev

Browse Source
This commit is contained in:
Riddle Hsu
2022-11-30 12:12:51 +00:00
committed by Android (Google) Code Review
parent 13b8dee0da 703eba7351
commit 57e36f7140
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/Transition.java
View File

@@ -943,13 +943,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
cleanUpInternal(); cleanUpInternal();
return; return;
} }
// Ensure that wallpaper visibility is updated with the latest wallpaper target.
for (int i = mParticipants.size() - 1; i >= 0; --i) {
final WindowContainer<?> wc = mParticipants.valueAt(i);
if (isWallpaper(wc) && wc.getDisplayContent() != null) {
wc.getDisplayContent().mWallpaperController.adjustWallpaperWindows();
}
}
mState = STATE_PLAYING; mState = STATE_PLAYING;
mStartTransaction = transaction; mStartTransaction = transaction;

9
services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java
View File

@@ -372,15 +372,6 @@ public class WallpaperControllerTests extends WindowTestsBase {
dc.mTransitionController.finishTransition(transit.getToken()); dc.mTransitionController.finishTransition(transit.getToken());
assertFalse(wallpaperWindow.isVisible()); assertFalse(wallpaperWindow.isVisible());
assertFalse(token.isVisible()); assertFalse(token.isVisible());
// Assume wallpaper was visible. When transaction is ready without wallpaper target,
// wallpaper should be requested to be invisible.
token.setVisibility(true);
transit = dc.mTransitionController.createTransition(TRANSIT_CLOSE);
dc.mTransitionController.collect(token);
transit.onTransactionReady(transit.getSyncId(), t);
assertFalse(token.isVisibleRequested());
assertTrue(token.isVisible());
} }
private static void prepareSmallerSecondDisplay(DisplayContent dc, int width, int height) { private static void prepareSmallerSecondDisplay(DisplayContent dc, int width, int height) {