Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev

Browse Source 
am: fe03504cf1

* commit 'fe03504cf1904a955bd8bbcd26f9121d754f5fc0':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: I793b9f59bf862c790c2c761c9a16aeef2c7e48cf
This commit is contained in:
Selim Cinek
2016-05-10 23:17:04 +00:00
committed by android-build-merger
parent 6b6a0e7773 fe03504cf1
commit c71d4f84f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -742,7 +742,7 @@ public class NotificationContentView extends FrameLayout {
}
} else {
if (noExpandedChild || (viewHeight <= mContractedChild.getHeight()
&& (!mIsChildInGroup
&& (!mIsChildInGroup || isGroupExpanded()
|| !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {
return VISIBLE_TYPE_CONTRACTED;
} else {