| commit | c71d4f84f3389744aa074bba534779eee36779e5 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Tue May 10 23:17:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 10 23:17:04 2016 +0000 |
| tree | ba268a94ad10dccea44ab4dd597d46356f05bab0 | |
| parent | 6b6a0e7773f1f55a04c91d8acb320ffe9de710f6 [diff] | |
| parent | fe03504cf1904a955bd8bbcd26f9121d754f5fc0 [diff] |
Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504cf1 * commit 'fe03504cf1904a955bd8bbcd26f9121d754f5fc0': Fixed a bug where the content wasn't transforming in a group Change-Id: I793b9f59bf862c790c2c761c9a16aeef2c7e48cf
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 {