diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java index 372aa90410eb..22fed63a0394 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java @@ -320,7 +320,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, if (mNotificationCount == 0) { end += mContentFrameMissingTranslation; } - start = (y < (HYPERSPACE_OFFRAMP+end)) ? y : (HYPERSPACE_OFFRAMP+end); + start = HYPERSPACE_OFFRAMP+end; } else { start = y; end = y + HYPERSPACE_OFFRAMP; @@ -336,10 +336,15 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, mContentAnim.cancel(); } + Animator fadeAnim = ObjectAnimator.ofFloat(mContentParent, "alpha", + mContentParent.getAlpha(), appearing ? 1.0f : 0.0f); + fadeAnim.setInterpolator(appearing + ? new android.view.animation.AccelerateInterpolator(2.0f) + : new android.view.animation.DecelerateInterpolator(2.0f)); + mContentAnim = new AnimatorSet(); mContentAnim - .play(ObjectAnimator.ofFloat(mContentParent, "alpha", - mContentParent.getAlpha(), appearing ? 1.0f : 0.0f)) + .play(fadeAnim) .with(bgAnim) .with(posAnim) ; |