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

Commit aefbeee8 authored by Chandru S's avatar Chandru S
Browse files

Remove unused field mLaunchingAffordanceWithPreview from ScrimState 

Bug: NA
Test: everything builds
Flag: EXEMPT dead code removal
Change-Id: I4b934c9e3de59f4742dce697a26d6ef1030537ae
parent fad3d5f8

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+1 −8
Original line number Diff line number Diff line
@@ -1024,8 +1024,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 


        if (mState == ScrimState.UNLOCKED || mState == ScrimState.DREAMING

                || mState == ScrimState.GLANCEABLE_HUB_OVER_DREAM) {

            final boolean occluding =

                    mOccludeAnimationPlaying || mState.mLaunchingAffordanceWithPreview;

            final boolean occluding = mOccludeAnimationPlaying;

            // Darken scrim as it's pulled down while unlocked. If we're unlocked but playing the

            // screen off/occlusion animations, ignore expansion changes while those animations

            // play.
@@ -1746,12 +1745,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        }

    }



    public void setLaunchingAffordanceWithPreview(boolean launchingAffordanceWithPreview) {

        for (ScrimState state : ScrimState.values()) {

            state.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);

        }

    }



    public interface Callback {

        default void onStart() {

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java

+1 −8
Original line number Diff line number Diff line
@@ -326,9 +326,7 @@ public enum ScrimState { 
            // If launch/occlude animations were playing, they already animated the scrim

            // alpha to 0f as part of the animation. If we animate it now, we'll set it back

            // to 1f and animate it back to 0f, causing an unwanted scrim flash.

            mAnimateChange = !mLaunchingAffordanceWithPreview

                    && !mOccludeAnimationPlaying

                    && !fromAod;

            mAnimateChange = !mOccludeAnimationPlaying && !fromAod;



            mFrontTint = Color.TRANSPARENT;

            mBehindTint = mBackgroundColor;
@@ -532,7 +530,6 @@ public enum ScrimState { 
    DozeParameters mDozeParameters;

    DockManager mDockManager;

    boolean mDisplayRequiresBlanking;

    boolean mLaunchingAffordanceWithPreview;

    boolean mOccludeAnimationPlaying;

    boolean mWakeLockScreenSensorActive;

    boolean mKeyguardFadingAway;
@@ -643,10 +640,6 @@ public enum ScrimState { 
        mNotificationScrimColor = notificationScrimColor;

    }



    public void setLaunchingAffordanceWithPreview(boolean launchingAffordanceWithPreview) {

        mLaunchingAffordanceWithPreview = launchingAffordanceWithPreview;

    }



    public void setOccludeAnimationPlaying(boolean occludeAnimationPlaying) {

        mOccludeAnimationPlaying = occludeAnimationPlaying;

    }