| commit | 0729cd5fe8079f2df2ba8aec48b3f6c4c17aa5c0 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Tue May 10 23:22:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 10 23:22:13 2016 +0000 |
| tree | 9ee402435d7eab6ec2f2f90ef174221d9ec75ddc | |
| parent | d2944c59f9783e10fef46384b07f08a5447471ce [diff] | |
| parent | 42829e0ca1bbe8b809bf2223a18baacb8723f67d [diff] |
Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 am: c71d4f84f3 am: 42829e0ca1 * commit '42829e0ca1bbe8b809bf2223a18baacb8723f67d': Fixed a bug where the content wasn't transforming in a group Change-Id: I82750b8db09d12df598ef1b7050045dc9128afe4
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index 078b3c6..5a8d4b3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -742,7 +742,7 @@ } } else { if (noExpandedChild || (viewHeight <= mContractedChild.getHeight() - && (!mIsChildInGroup + && (!mIsChildInGroup || isGroupExpanded() || !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) { return VISIBLE_TYPE_CONTRACTED; } else {