Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'eec2028698cfb80734cd03356d81671f8be31c66':
  Fix broken intitial notification panel animation.
This commit is contained in:
Daniel Sandler
2011-01-29 22:39:07 -08:00
committed by Android Git Automerger
parent 915bacf6c4 eec2028698
commit bda99568d8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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