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

Commit 18892cf3 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Promote keyguardGoingAwayWallpaper check condition." into rvc-dev am: e71b44a8 

Change-Id: I15ae747703bd47c155d1677108a48127353b1358
parents f8bb4fef e71b44a8

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

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ public class AppTransitionController { 
                Animation anim = mService.mPolicy.createKeyguardWallpaperExit(

                        (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0);

                if (anim != null) {

                    anim.scaleCurrentDuration(mService.getTransitionAnimationScaleLocked());

                    mDisplayContent.mWallpaperController.startWallpaperAnimation(anim);

                }

            }

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

+7 −7
Original line number Diff line number Diff line
@@ -142,10 +142,12 @@ class WallpaperController { 
            mFindResults.setUseTopWallpaperAsTarget(true);

        }



        final boolean keyguardGoingAwayWithWallpaper = (w.mActivityRecord != null

                && w.mActivityRecord.isAnimating(TRANSITION | PARENTS)

                && AppTransition.isKeyguardGoingAwayTransit(w.mActivityRecord.getTransit())

                && (w.mActivityRecord.getTransitFlags()

        final WindowContainer animatingContainer = w.mActivityRecord != null

                ? w.mActivityRecord.getAnimatingContainer() : null;

        final boolean keyguardGoingAwayWithWallpaper = (animatingContainer != null

                && animatingContainer.isAnimating(TRANSITION | PARENTS)

                && AppTransition.isKeyguardGoingAwayTransit(animatingContainer.mTransit)

                && (animatingContainer.mTransitFlags

                & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0);



        boolean needsShowWhenLockedWallpaper = false;
@@ -166,8 +168,6 @@ class WallpaperController { 


        final RecentsAnimationController recentsAnimationController =

                mService.getRecentsAnimationController();

        final WindowContainer animatingContainer =

                w.mActivityRecord != null ? w.mActivityRecord.getAnimatingContainer() : null;

        final boolean animationWallpaper = animatingContainer != null

                && animatingContainer.getAnimation() != null

                && animatingContainer.getAnimation().getShowWallpaper();