diff options
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index 548e7d2..e6eca22 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java @@ -211,6 +211,7 @@ public class NotificationContentView extends FrameLayout { private void setImageViewDark(boolean dark, boolean fade, int imageViewId) { // TODO: implement fade final ImageView v = (ImageView) mContractedChild.findViewById(imageViewId); + if (v == null) return; final Drawable d = v.getBackground(); if (dark) { v.setLayerType(LAYER_TYPE_HARDWARE, INVERT_PAINT); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index e60bd4f..788d5ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2016,7 +2016,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, .alpha(1f) .setDuration(320) .setInterpolator(ALPHA_IN) - .setStartDelay(50); + .setStartDelay(50) + + // We need to clean up any pending end action from animateStatusBarHide if we call + // both hide and show in the same frame before the animation actually gets started. + // cancel() doesn't really remove the end action. + .withEndAction(null); // Synchronize the motion with the Keyguard fading if necessary. if (mKeyguardFadingAway) { |