Merge "Fixed an issue where the notification could become transparent" into lmp-dev

This commit is contained in:
Selim Cinek
2014-10-09 23:05:03 +00:00
committed by Android (Google) Code Review

View File

@@ -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);