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

Fixed a bug where the fade in from dark would not work properly

Browse Source 
Change-Id: Idd0b38b40b06806c727d8e033847a0da0b51f55e
Fixes: 30224123
This commit is contained in:
Selim Cinek
2016-07-21 17:21:09 -07:00
parent 981962e6ad
commit 7baaa9e82b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
View File

@@ -137,11 +137,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
private float mNormalBackgroundVisibilityAmount; private float mNormalBackgroundVisibilityAmount;
private ValueAnimator mFadeInFromDarkAnimator; private ValueAnimator mFadeInFromDarkAnimator;
private float mDimmedBackgroundFadeInAmount = -1;
private ValueAnimator.AnimatorUpdateListener mBackgroundVisibilityUpdater private ValueAnimator.AnimatorUpdateListener mBackgroundVisibilityUpdater
= new ValueAnimator.AnimatorUpdateListener() { = new ValueAnimator.AnimatorUpdateListener() {
@Override @Override
public void onAnimationUpdate(ValueAnimator animation) { public void onAnimationUpdate(ValueAnimator animation) {
setNormalBackgroundVisibilityAmount(mBackgroundNormal.getAlpha()); setNormalBackgroundVisibilityAmount(mBackgroundNormal.getAlpha());
mDimmedBackgroundFadeInAmount = mBackgroundDimmed.getAlpha();
} }
}; };
private AnimatorListenerAdapter mFadeInEndListener = new AnimatorListenerAdapter() { private AnimatorListenerAdapter mFadeInEndListener = new AnimatorListenerAdapter() {
@@ -149,6 +151,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation); super.onAnimationEnd(animation);
mFadeInFromDarkAnimator = null; mFadeInFromDarkAnimator = null;
mDimmedBackgroundFadeInAmount = -1;
updateBackground(); updateBackground();
} }
}; };
@@ -598,6 +601,9 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
protected void updateBackgroundAlpha(float transformationAmount) { protected void updateBackgroundAlpha(float transformationAmount) {
mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f; mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f;
if (mDimmedBackgroundFadeInAmount != -1) {
mBgAlpha *= mDimmedBackgroundFadeInAmount;
}
mBackgroundDimmed.setAlpha(mBgAlpha); mBackgroundDimmed.setAlpha(mBgAlpha);
} }

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

@@ -1122,7 +1122,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mPrivateLayout.setUserExpanding(userLocked); mPrivateLayout.setUserExpanding(userLocked);
if (mIsSummaryWithChildren) { if (mIsSummaryWithChildren) {
mChildrenContainer.setUserLocked(userLocked); mChildrenContainer.setUserLocked(userLocked);
if (userLocked || (!userLocked && !isGroupExpanded())) { if (userLocked || !isGroupExpanded()) {
updateBackgroundForGroupState(); updateBackgroundForGroupState();
} }
} }