am 2b0db74a: am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev

* commit '2b0db74ad21367427372bdfb1e28319a72b454b3':
  Fixed a bug where redacted notifications had the wrong height
This commit is contained in:
Selim Cinek
2015-07-07 02:06:01 +00:00
committed by Android Git Automerger

View File

@@ -1764,6 +1764,7 @@ public class NotificationStackScrollLayout extends ViewGroup
}
private void onViewAddedInternal(View child) {
updateHideSensitiveForChild(child);
mStackScrollAlgorithm.notifyChildrenChanged(this);
((ExpandableView) child).setOnHeightChangedListener(this);
generateAddAnimation(child, false /* fromMoreCard */);
@@ -1776,6 +1777,13 @@ public class NotificationStackScrollLayout extends ViewGroup
}
}
private void updateHideSensitiveForChild(View child) {
if (mAmbientState.isHideSensitive() && child instanceof ExpandableView) {
ExpandableView expandableView = (ExpandableView) child;
expandableView.setHideSensitiveForIntrinsicHeight(true);
}
}
public void notifyGroupChildRemoved(View row) {
onViewRemovedInternal(row);
}