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 am: fe03504cf1

Browse Source 
am: c71d4f84f3

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

Change-Id: Ibd7e450a5cd449ebefd1e0f0c75ef9e59f600070
This commit is contained in:
Selim Cinek
2016-05-10 23:19:39 +00:00
committed by android-build-merger
parent 0b62228803 c71d4f84f3
commit 42829e0ca1
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 {