| commit | fe03504cf1904a955bd8bbcd26f9121d754f5fc0 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Tue May 10 23:14:00 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 23:14:01 2016 +0000 |
| tree | 851e2fc8df6071b43885f2d9eee719700f5b0ce3 | |
| parent | 549a822331a522cabfb854b91b1cad5a0f7128ae [diff] | |
| parent | 6ac3fa8ebde529f4bc9d90bc2ac73bcd8634a494 [diff] |
Merge "Fixed a bug where the content wasn't transforming in a group" into nyc-dev
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 {