Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e697b817 authored by wilsonshih's avatar wilsonshih
Browse files

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

Fix the flicker when WindowState#removeIfPossible apply exit animation.

Test: atest SplashscreenTests SplashscreenTests
Bug: 183004107
Bug: 182815506
Change-Id: I3ac4ad98ab9e9c295f78ba6f86e1e02f2067163b
parent 46b8d722

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

+11 −19
Original line number Diff line number Diff line
@@ -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;

        }



        @Override

        public void run() {

            if (mDecorView == null) {

                return;

    private void removeWindowInner(View decorView, boolean hideView) {

        if (hideView) {

            decorView.setVisibility(View.GONE);

        }

            final WindowManager wm = mDecorView.getContext().getSystemService(WindowManager.class);

        final WindowManager wm = decorView.getContext().getSystemService(WindowManager.class);

        if (wm != null) {

                wm.removeView(mDecorView);

            }

            mDecorView = null;

            wm.removeView(decorView);

        }

    }