Merge "Made the notificationViewStates static"

This commit is contained in:
Selim Cinek
2017-02-15 20:10:08 +00:00
committed by Android (Google) Code Review

View File

@@ -1990,7 +1990,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
mAboveShelf = aboveShelf;
}
public class NotificationViewState extends ExpandableViewState {
public static class NotificationViewState extends ExpandableViewState {
private final StackScrollState mOverallState;
@@ -2011,8 +2011,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
@Override
protected void onYTranslationAnimationFinished(View view) {
super.onYTranslationAnimationFinished(view);
if (mHeadsupDisappearRunning) {
setHeadsUpAnimatingAway(false);
if (view instanceof ExpandableNotificationRow) {
ExpandableNotificationRow row = (ExpandableNotificationRow) view;
if (row.isHeadsUpAnimatingAway()) {
row.setHeadsUpAnimatingAway(false);
}
}
}