Fixed a bug where the fade in from dark would not work properly (7baaa9e8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -137,11 +137,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView

		private float mNormalBackgroundVisibilityAmount;
		private ValueAnimator mFadeInFromDarkAnimator;
		private float mDimmedBackgroundFadeInAmount = -1;
		private ValueAnimator.AnimatorUpdateListener mBackgroundVisibilityUpdater
		= new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		setNormalBackgroundVisibilityAmount(mBackgroundNormal.getAlpha());
		mDimmedBackgroundFadeInAmount = mBackgroundDimmed.getAlpha();
		}
		};
		private AnimatorListenerAdapter mFadeInEndListener = new AnimatorListenerAdapter() {
		@@ -149,6 +151,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		public void onAnimationEnd(Animator animation) {
		super.onAnimationEnd(animation);
		mFadeInFromDarkAnimator = null;
		mDimmedBackgroundFadeInAmount = -1;
		updateBackground();
		}
		};
		@@ -598,6 +601,9 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView

		protected void updateBackgroundAlpha(float transformationAmount) {
		mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f;
		if (mDimmedBackgroundFadeInAmount != -1) {
		mBgAlpha *= mDimmedBackgroundFadeInAmount;
		}
		mBackgroundDimmed.setAlpha(mBgAlpha);
		}

+1 −1

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