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

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

Browse Source 
* commit '4d696690e6fb4059608d239624fde255c916b8e2':
  Fixed a bug where redacted notifications had the wrong height
This commit is contained in:
Selim Cinek
2015-07-07 01:48:57 +00:00
committed by Android Git Automerger
parent 1f67e4c826 4d696690e6
commit 2b0db74ad2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -1764,6 +1764,7 @@ public class NotificationStackScrollLayout extends ViewGroup
} }
private void onViewAddedInternal(View child) { private void onViewAddedInternal(View child) {
updateHideSensitiveForChild(child);
mStackScrollAlgorithm.notifyChildrenChanged(this); mStackScrollAlgorithm.notifyChildrenChanged(this);
((ExpandableView) child).setOnHeightChangedListener(this); ((ExpandableView) child).setOnHeightChangedListener(this);
generateAddAnimation(child, false /* fromMoreCard */); 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) { public void notifyGroupChildRemoved(View row) {
onViewRemovedInternal(row); onViewRemovedInternal(row);
} }