Merge "Fixed a bug where Notifications could overlap" into nyc-dev

am: fa2dc63505

* commit 'fa2dc635052afa870629141dfcc7374fed5e9768':
  Fixed a bug where Notifications could overlap

Change-Id: I2123a1e204d3b9aaac300a682cb1514d62ba101b
This commit is contained in:
Selim Cinek
2016-05-09 19:15:58 +00:00
committed by android-build-merger

View File

@@ -2342,9 +2342,9 @@ public class NotificationStackScrollLayout extends ViewGroup
}
private void updateHideSensitiveForChild(View child) {
if (mAmbientState.isHideSensitive() && child instanceof ExpandableView) {
if (child instanceof ExpandableView) {
ExpandableView expandableView = (ExpandableView) child;
expandableView.setHideSensitiveForIntrinsicHeight(true);
expandableView.setHideSensitiveForIntrinsicHeight(mAmbientState.isHideSensitive());
}
}