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

Commit 8868a460 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Wait for notification shade to redraw on orientation change" into... 

Merge "Wait for notification shade to redraw on orientation change" into sc-dev am: 7b4e645c am: 8b4620cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401463

Change-Id: Ia163fee37091b34da86917f84daf83839a08f831
parents c6916790 8b4620cd

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

+2 −4
Original line number Diff line number Diff line
@@ -66,10 +66,8 @@ public class FadeRotationAnimationController extends FadeAnimationController { 
        } else {

            mNavBarToken = null;

        }

        // Do not fade notification shade when running fixed rotation (not frozen) because it may

        // need to animate with the launching app.

        final WindowState notificationShade = mFrozenTimeoutRunnable == null

                ? displayPolicy.getNotificationShade() : null;

        // Collect the target windows to fade out. The display won't wait for them to unfreeze.

        final WindowState notificationShade = displayPolicy.getNotificationShade();

        displayContent.forAllWindows(w -> {

            if (w.mActivityRecord == null && w.mHasSurface && !w.mForceSeamlesslyRotate

                    && !w.mIsWallpaper && !w.mIsImWindow && w != navigationBar