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

Merge "Clean up animation listener when translating notification" into nyc-dev

Browse Source
This commit is contained in:
Mady Mellor
2016-03-14 21:02:43 +00:00
committed by Android (Google) Code Review
parent 0a278b127b 723f1f996f
commit 336d8a8092
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -745,6 +745,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
public Animator getTranslateViewAnimator(final float leftTarget,
AnimatorUpdateListener listener) {
if (mTranslateAnim != null) {
mTranslateAnim.cancel();
}
if (areGutsExposed()) {
// No translation if guts are exposed.
return null;
@@ -769,19 +772,27 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
if (listener != null) {
translateAnim.addUpdateListener(listener);
}
}
translateAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator anim) {
if (mSettingsIconRow != null && leftTarget == 0) {
mSettingsIconRow.resetState();
translateAnim.addListener(new AnimatorListenerAdapter() {
boolean cancelled = false;
@Override
public void onAnimationCancel(Animator anim) {
cancelled = true;
}
mTranslateAnim = null;
}
});
@Override
public void onAnimationEnd(Animator anim) {
if (!cancelled && mSettingsIconRow != null && leftTarget == 0) {
mSettingsIconRow.resetState();
mTranslateAnim = null;
}
}
});
}
set.play(translateAnim);
}
}
mTranslateAnim = set;
return set;
}