Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-27 21:18:11 +00:00
committed by Android (Google) Code Review
parent 02be5d1ddd 2b192ec57b
commit 3889146f82
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,7 @@ public class DozeScrimController {
mHandler.removeCallbacks(mPulseOutExtended); mHandler.removeCallbacks(mPulseOutExtended);
if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing); if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing);
if (!mDozing) return; if (!mDozing) return;
startScrimAnimation(true /* inFront */, mDozeParameters.getAlwaysOn() ? 0 : 1, startScrimAnimation(true /* inFront */, 1,
mDozeParameters.getPulseOutDuration(), mDozeParameters.getPulseOutDuration(),
Interpolators.ALPHA_IN, mPulseOutFinished); 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. // Signal that the pulse is all finished so we can turn the screen off now.
pulseFinished(); pulseFinished();
if (mDozeParameters.getAlwaysOn()) {
mScrimController.setDozeInFrontAlpha(0);
}
} }
}; };
} }