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

Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-15 00:09:46 +00:00
committed by Android (Google) Code Review
parent 6028472b8a 76e813c155
commit 70b06cc62f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2654,6 +2654,10 @@ public class NotificationStackScrollLayout extends ViewGroup
type = row.wasJustClicked() type = row.wasJustClicked()
? AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR_CLICK ? AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR_CLICK
: AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR; : AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR;
if (row.isChildInGroup()) {
// We can otherwise get stuck in there if it was just isolated
row.setHeadsupDisappearRunning(false);
}
} else { } else {
StackViewState viewState = mCurrentStackScrollState.getViewStateForView(row); StackViewState viewState = mCurrentStackScrollState.getViewStateForView(row);
if (viewState == null) { if (viewState == null) {
@@ -3150,7 +3154,13 @@ public class NotificationStackScrollLayout extends ViewGroup
for (int i = 0; i < getChildCount(); i++) { for (int i = 0; i < getChildCount(); i++) {
View view = getChildAt(i); View view = getChildAt(i);
if (view instanceof ExpandableNotificationRow) { if (view instanceof ExpandableNotificationRow) {
((ExpandableNotificationRow) view).setHeadsupDisappearRunning(false); ExpandableNotificationRow row = (ExpandableNotificationRow) view;
row.setHeadsupDisappearRunning(false);
if (row.isSummaryWithChildren()) {
for (ExpandableNotificationRow child : row.getNotificationChildren()) {
child.setHeadsupDisappearRunning(false);
}
}
} }
} }
} }