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

Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev am: 7fc88ac214

Browse Source 
am: 71d7ca4e92

* commit '71d7ca4e92c5f4899797590467d8996ef2ae5884':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I16d09de65dc58d83d20eb7b8e6ddbc3480b118bf
This commit is contained in:
Selim Cinek
2016-05-23 19:38:27 +00:00
committed by android-build-merger
parent 2bb3e37630 71d7ca4e92
commit 5937d9ec0d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,6 +322,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
if (scrim instanceof ScrimView) { if (scrim instanceof ScrimView) {
float alpha2 = getDozeAlpha(scrim); float alpha2 = getDozeAlpha(scrim);
float alpha = 1 - (1 - alpha1) * (1 - alpha2); float alpha = 1 - (1 - alpha1) * (1 - alpha2);
alpha = Math.max(0, Math.min(1.0f, alpha));
((ScrimView) scrim).setScrimColor(Color.argb((int) (alpha * 255), 0, 0, 0)); ((ScrimView) scrim).setScrimColor(Color.argb((int) (alpha * 255), 0, 0, 0));
} else { } else {
scrim.setAlpha(alpha1); scrim.setAlpha(alpha1);
@@ -468,6 +469,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
PropertyValuesHolder[] values = previousAnimator.getValues(); PropertyValuesHolder[] values = previousAnimator.getValues();
float relativeDiff = alpha - previousEndValue; float relativeDiff = alpha - previousEndValue;
float newStartValue = previousStartValue + relativeDiff; float newStartValue = previousStartValue + relativeDiff;
newStartValue = Math.max(0, Math.min(1.0f, newStartValue));
values[0].setFloatValues(newStartValue, alpha); values[0].setFloatValues(newStartValue, alpha);
scrim.setTag(TAG_START_ALPHA, newStartValue); scrim.setTag(TAG_START_ALPHA, newStartValue);
scrim.setTag(TAG_END_ALPHA, alpha); scrim.setTag(TAG_END_ALPHA, alpha);