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
This commit is contained in:
Selim Cinek
2016-05-10 23:14:00 +00:00
committed by Android (Google) Code Review
parent 549a822331 6ac3fa8ebd
commit fe03504cf1
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 { } else {
if (noExpandedChild || (viewHeight <= mContractedChild.getHeight() if (noExpandedChild || (viewHeight <= mContractedChild.getHeight()
&& (!mIsChildInGroup && (!mIsChildInGroup || isGroupExpanded()
|| !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) { || !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {
return VISIBLE_TYPE_CONTRACTED; return VISIBLE_TYPE_CONTRACTED;
} else { } else {