diff options
| author | Selim Cinek <cinek@google.com> | 2014-08-25 14:17:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 14:17:13 +0000 |
| commit | 0db4f35e0bbc25ee25ebe2d57174893217248597 (patch) | |
| tree | a5b47aacac06922f6b8ccc3b72afcb1f6a542f88 | |
| parent | 6adf1588fd2bccb8cf95a9c3456230bba805fab9 (diff) | |
| parent | 0e41dea0b36f270a7cd22749c50a91b90f3373b5 (diff) | |
| download | frameworks_base-0db4f35e0bbc25ee25ebe2d57174893217248597.zip frameworks_base-0db4f35e0bbc25ee25ebe2d57174893217248597.tar.gz frameworks_base-0db4f35e0bbc25ee25ebe2d57174893217248597.tar.bz2 | |
Merge "Fixed a bug where animations were generated when closed." into lmp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java | 4 |
1 files changed, 3 insertions, 1 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 1469d73..ce17795 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -1913,7 +1913,9 @@ public class NotificationStackScrollLayout extends ViewGroup @Override public void onReset(ExpandableView view) { - mRequestViewResizeAnimationOnLayout = true; + if (mIsExpanded && mAnimationsEnabled) { + mRequestViewResizeAnimationOnLayout = true; + } mStackScrollAlgorithm.onReset(view); } |