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 am: 70b06cc62f

Browse Source 
am: 58526c8391

Change-Id: I4d60c9ee527228541d393f725854081ac13f3c91
This commit is contained in:
Selim Cinek
2016-07-15 00:19:25 +00:00
committed by android-build-merger
parent ed1622559e 58526c8391
commit bce45cdd46
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

@@ -2656,6 +2656,10 @@ public class NotificationStackScrollLayout extends ViewGroup
type = row.wasJustClicked()
? AnimationEvent.ANIMATION_TYPE_HEADS_UP_DISAPPEAR_CLICK
: 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 {
StackViewState viewState = mCurrentStackScrollState.getViewStateForView(row);
if (viewState == null) {
@@ -3156,7 +3160,13 @@ public class NotificationStackScrollLayout extends ViewGroup
for (int i = 0; i < getChildCount(); i++) {
View view = getChildAt(i);
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);
}
}
}
}
}