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

Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-17 18:28:57 +00:00
committed by Android (Google) Code Review
parent b70a55a7b5 589cd37507
commit 36d3f3fd02
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ public class DozeScrimController {
private boolean mFullyPulsing; private boolean mFullyPulsing;
private float mAodFrontScrimOpacity = 0; private float mAodFrontScrimOpacity = 0;
private Runnable mSetDozeInFrontAlphaDelayed;
public DozeScrimController(ScrimController scrimController, Context context) { public DozeScrimController(ScrimController scrimController, Context context) {
mContext = context; mContext = context;
@@ -69,8 +70,7 @@ public class DozeScrimController {
mDozingAborted = false; mDozingAborted = false;
abortAnimations(); abortAnimations();
mScrimController.setDozeBehindAlpha(1f); mScrimController.setDozeBehindAlpha(1f);
mScrimController.setDozeInFrontAlpha( setDozeInFrontAlpha(mDozeParameters.getAlwaysOn() ? mAodFrontScrimOpacity : 1f);
mDozeParameters.getAlwaysOn() ? mAodFrontScrimOpacity : 1f);
} else { } else {
cancelPulsing(); cancelPulsing();
if (animate) { if (animate) {
@@ -83,7 +83,7 @@ public class DozeScrimController {
} else { } else {
abortAnimations(); abortAnimations();
mScrimController.setDozeBehindAlpha(0f); mScrimController.setDozeBehindAlpha(0f);
mScrimController.setDozeInFrontAlpha(0f); setDozeInFrontAlpha(0f);
} }
} }
} }
@@ -97,7 +97,7 @@ public class DozeScrimController {
mAodFrontScrimOpacity = scrimOpacity; mAodFrontScrimOpacity = scrimOpacity;
if (mDozing && !isPulsing() && !mDozingAborted && !mWakeAndUnlocking if (mDozing && !isPulsing() && !mDozingAborted && !mWakeAndUnlocking
&& mDozeParameters.getAlwaysOn()) { && mDozeParameters.getAlwaysOn()) {
mScrimController.setDozeInFrontAlpha(mAodFrontScrimOpacity); setDozeInFrontAlpha(mAodFrontScrimOpacity);
} }
} }
@@ -107,7 +107,7 @@ public class DozeScrimController {
if (!mWakeAndUnlocking) { if (!mWakeAndUnlocking) {
mWakeAndUnlocking = true; mWakeAndUnlocking = true;
mScrimController.setDozeBehindAlpha(0f); mScrimController.setDozeBehindAlpha(0f);
mScrimController.setDozeInFrontAlpha(0f); setDozeInFrontAlpha(0f);
} }
} }
@@ -127,7 +127,7 @@ public class DozeScrimController {
// be invoked when we're done so that the caller can drop the pulse wakelock. // be invoked when we're done so that the caller can drop the pulse wakelock.
mPulseCallback = callback; mPulseCallback = callback;
mPulseReason = reason; mPulseReason = reason;
mScrimController.setDozeInFrontAlpha(1f); setDozeInFrontAlpha(1f);
mHandler.post(mPulseIn); mHandler.post(mPulseIn);
} }
@@ -138,9 +138,8 @@ public class DozeScrimController {
cancelPulsing(); cancelPulsing();
if (mDozing && !mWakeAndUnlocking) { if (mDozing && !mWakeAndUnlocking) {
mScrimController.setDozeBehindAlpha(1f); mScrimController.setDozeBehindAlpha(1f);
mScrimController.setDozeInFrontAlpha( setDozeInFrontAlpha(mDozeParameters.getAlwaysOn() && !mDozingAborted
mDozeParameters.getAlwaysOn() && !mDozingAborted ? ? mAodFrontScrimOpacity : 1f);
mAodFrontScrimOpacity : 1f);
} }
} }
@@ -295,6 +294,25 @@ public class DozeScrimController {
: mScrimController.getDozeBehindAlpha(); : mScrimController.getDozeBehindAlpha();
} }
private void setDozeInFrontAlpha(float opacity) {
setDozeInFrontAlphaDelayed(opacity, 0 /* delay */);
}
private void setDozeInFrontAlphaDelayed(float opacity, long delayMs) {
if (mSetDozeInFrontAlphaDelayed != null) {
mHandler.removeCallbacks(mSetDozeInFrontAlphaDelayed);
mSetDozeInFrontAlphaDelayed = null;
}
if (delayMs < 0) {
mScrimController.setDozeInFrontAlpha(opacity);
} else {
mHandler.postDelayed(mSetDozeInFrontAlphaDelayed = () -> {
setDozeInFrontAlpha(opacity);
}, delayMs);
}
}
private final Runnable mPulseIn = new Runnable() { private final Runnable mPulseIn = new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -364,7 +382,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.
DozeScrimController.this.pulseFinished(); DozeScrimController.this.pulseFinished();
if (mDozeParameters.getAlwaysOn()) { if (mDozeParameters.getAlwaysOn()) {
mScrimController.setDozeInFrontAlpha(mAodFrontScrimOpacity); // Setting power states can happen after we push out the frame. Make sure we
// stay fully opaque until the power state request reaches the lower levels.
setDozeInFrontAlphaDelayed(mAodFrontScrimOpacity, 30);
} }
} }
}; };