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

Prevent the decor view to be visible again after exit animation finish.

Browse Source 
Fix the flicker when WindowState#removeIfPossible apply exit animation.

Test: atest SplashscreenTests SplashscreenTests
Bug: 183004107
Bug: 182815506
Change-Id: I3ac4ad98ab9e9c295f78ba6f86e1e02f2067163b
This commit is contained in:
wilsonshih
2021-03-19 16:50:05 +08:00
parent 46b8d72273
commit e697b8176c
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java
View File

@@ -382,14 +382,16 @@ public class StartingSurfaceDrawer {
Slog.v(TAG, "Removing splash screen window for task: " + taskId);
}
if (record.mContentView != null) {
final HandleExitFinish exitFinish = new HandleExitFinish(record.mDecorView);
if (leash != null || playRevealAnimation) {
mSplashscreenContentDrawer.applyExitAnimation(record.mContentView,
leash, frame, record.isEarlyExit(), exitFinish);
leash, frame, record.isEarlyExit(),
() -> removeWindowInner(record.mDecorView, true));
} else {
// TODO(183004107) Always hide decorView when playRevealAnimation is enabled
// from TaskOrganizerController#removeStartingWindow
// the SplashScreenView has been copied to client, skip default exit
// animation
exitFinish.run();
removeWindowInner(record.mDecorView, false);
}
}
}
@@ -403,23 +405,13 @@ public class StartingSurfaceDrawer {
}
}
private static class HandleExitFinish implements Runnable {
private View mDecorView;
HandleExitFinish(View decorView) {
mDecorView = decorView;
private void removeWindowInner(View decorView, boolean hideView) {
if (hideView) {
decorView.setVisibility(View.GONE);
}
@Override
public void run() {
if (mDecorView == null) {
return;
}
final WindowManager wm = mDecorView.getContext().getSystemService(WindowManager.class);
if (wm != null) {
wm.removeView(mDecorView);
}
mDecorView = null;
final WindowManager wm = decorView.getContext().getSystemService(WindowManager.class);
if (wm != null) {
wm.removeView(decorView);
}
}