commit ec4c5193689c30064d87a5febfde7c300b439f6c
author Daniel Sandler <dsandler@google.com> Sat Jan 29 22:41:42 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 29 22:41:42 2011 -0800
tree 64aab88905dfd6a22600aac13e17f59bf7ba2720
parent 8925761889c47d18022ae520652c52da2e39254a
parent bda99568d84530c6442af0602e9c12e6cb897780

am bda99568: am eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb

* commit 'bda99568d84530c6442af0602e9c12e6cb897780':
  Fix broken intitial notification panel animation.

packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java

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 372aa90..22fed63 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 @@
                 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 @@
                 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)
                 ;