Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda99568 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

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

* commit 'eec20286':
  Fix broken intitial notification panel animation.
parents 915bacf6 eec20286

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, 
                if (mNotificationCount == 0) {

                if (mNotificationCount == 0) {

                    end += mContentFrameMissingTranslation;

                    end += mContentFrameMissingTranslation;

                }

                }

                start = (y < (HYPERSPACE_OFFRAMP+end)) ? y : (HYPERSPACE_OFFRAMP+end);

                start = HYPERSPACE_OFFRAMP+end;

            } else {

            } else {

                start = y;

                start = y;

                end = y + HYPERSPACE_OFFRAMP;

                end = y + HYPERSPACE_OFFRAMP;
@@ -336,10 +336,15 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, 
                mContentAnim.cancel();

                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 = new AnimatorSet();

            mContentAnim

            mContentAnim

                .play(ObjectAnimator.ofFloat(mContentParent, "alpha",

                .play(fadeAnim)

                    mContentParent.getAlpha(), appearing ? 1.0f : 0.0f))

                .with(bgAnim)

                .with(bgAnim)

                .with(posAnim)

                .with(posAnim)

                ;

                ;