am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev

* commit 'a4be1b2bcdc768708f594b69923986617a367820':
  Fix empty notification panel.
This commit is contained in:
Daniel Sandler
2012-10-22 12:17:26 -07:00
committed by Android Git Automerger

View File

@@ -1577,6 +1577,12 @@ public class PhoneStatusBar extends BaseStatusBar {
if (mHasFlipSettings) {
// reset things to their proper state
if (mFlipSettingsViewAnim != null) mFlipSettingsViewAnim.cancel();
if (mScrollViewAnim != null) mScrollViewAnim.cancel();
if (mSettingsButtonAnim != null) mSettingsButtonAnim.cancel();
if (mNotificationButtonAnim != null) mNotificationButtonAnim.cancel();
if (mClearButtonAnim != null) mClearButtonAnim.cancel();
mScrollView.setScaleX(1f);
mScrollView.setVisibility(View.VISIBLE);
mSettingsButton.setAlpha(1f);