diff options
| author | Selim Cinek <cinek@google.com> | 2014-12-11 14:08:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-11 14:09:00 +0000 |
| commit | 372eb38c17b8bcd304985d7a36168c175f625016 (patch) | |
| tree | fe32cb047c46d2e2bad08bf52be9f719681b2bac | |
| parent | 8f51c4c5e51e1581ba9892bc095453b8fc315f7b (diff) | |
| parent | 2086710f58032d8ea2dfd7b6e514954d4aab498f (diff) | |
| download | frameworks_base-372eb38c17b8bcd304985d7a36168c175f625016.zip frameworks_base-372eb38c17b8bcd304985d7a36168c175f625016.tar.gz frameworks_base-372eb38c17b8bcd304985d7a36168c175f625016.tar.bz2 | |
Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 2a393bf..6dcbed6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -2280,8 +2280,7 @@ public class NotificationStackScrollLayout extends ViewGroup updateContentHeight(); notifyHeightChangeListener(mDismissView); } else { - mEmptyShadeView.setWillBeGone(true); - mEmptyShadeView.performVisibilityAnimation(false, new Runnable() { + Runnable onFinishedRunnable = new Runnable() { @Override public void run() { mEmptyShadeView.setVisibility(GONE); @@ -2289,7 +2288,14 @@ public class NotificationStackScrollLayout extends ViewGroup updateContentHeight(); notifyHeightChangeListener(mDismissView); } - }); + }; + if (mAnimationsEnabled) { + mEmptyShadeView.setWillBeGone(true); + mEmptyShadeView.performVisibilityAnimation(false, onFinishedRunnable); + } else { + mEmptyShadeView.setInvisible(); + onFinishedRunnable.run(); + } } } } @@ -2318,7 +2324,7 @@ public class NotificationStackScrollLayout extends ViewGroup notifyHeightChangeListener(mDismissView); } }; - if (mDismissView.isButtonVisible() && mIsExpanded) { + if (mDismissView.isButtonVisible() && mIsExpanded && mAnimationsEnabled) { mDismissView.setWillBeGone(true); mDismissView.performVisibilityAnimation(false, dimissHideFinishRunnable); } else { |