am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev (3e056aa0) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -403,6 +403,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		}

		private void fadeBackground() {
		mBackgroundNormal.animate().cancel();
		if (mDimmed) {
		mBackgroundDimmed.setVisibility(View.VISIBLE);
		} else {
		@@ -446,6 +447,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		mBackgroundDimmed.setVisibility(View.VISIBLE);
		mBackgroundNormal.setVisibility(View.INVISIBLE);
		} else {
		cancelFadeAnimations();
		mBackgroundDimmed.setVisibility(View.INVISIBLE);
		mBackgroundNormal.setVisibility(View.VISIBLE);
		mBackgroundNormal.setAlpha(1f);
		@@ -453,6 +455,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		}
		}

		private void cancelFadeAnimations() {
		if (mBackgroundAnimator != null) {
		mBackgroundAnimator.cancel();
		}
		mBackgroundNormal.animate().cancel();
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);