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

Commit e4fb1cbd authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev 

am: 3889146f

Change-Id: I4dfc8c44f3bc35160266d3fec0bc6756f3d8b8db
parents a385f7d2 3889146f

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

+4 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ public class DozeScrimController { 
            mHandler.removeCallbacks(mPulseOutExtended);

            if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing);

            if (!mDozing) return;

            startScrimAnimation(true /* inFront */, mDozeParameters.getAlwaysOn() ? 0 : 1,

            startScrimAnimation(true /* inFront */, 1,

                    mDozeParameters.getPulseOutDuration(),

                    Interpolators.ALPHA_IN, mPulseOutFinished);

        }
@@ -336,6 +336,9 @@ public class DozeScrimController { 


            // Signal that the pulse is all finished so we can turn the screen off now.

            pulseFinished();

            if (mDozeParameters.getAlwaysOn()) {

                mScrimController.setDozeInFrontAlpha(0);

            }

        }

    };

}