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

Merge "Made usages of animate().setListener() call safer" into sc-v2-dev

Browse Source
This commit is contained in:
Selim Cinek
2021-11-24 10:30:15 +00:00
committed by Android (Google) Code Review
parent 0dcd4ddcb2 345cb6fec2
commit fdbed18c79
6 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
View File

@@ -2371,7 +2371,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
message.animate()
.alpha(0f)
.setDuration(TOAST_FADE_TIME)
.setStartDelay(visibleTime);
.setStartDelay(visibleTime)
.setListener(null);
}
});
}

9
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
View File

@@ -289,6 +289,9 @@ public abstract class MediaOutputBaseAdapter extends
public void onAnimationEnd(Animator animation) {
to.requireViewById(R.id.volume_indeterminate_progress).setVisibility(
View.VISIBLE);
// Unset the listener, otherwise this may persist for another view
// property animation
toTitleText.animate().setListener(null);
}
});
// Animation for seek bar
@@ -312,8 +315,14 @@ public abstract class MediaOutputBaseAdapter extends
public void onAnimationEnd(Animator animation) {
mIsAnimating = false;
notifyDataSetChanged();
// Unset the listener, otherwise this may persist for
// another view property animation
fromTitleText.animate().setListener(null);
}
});
// Unset the listener, otherwise this may persist for another view
// property animation
fromSeekBar.animate().setListener(null);
}
});
}

2
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -770,6 +770,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
public void onAnimationEnd(Animator animation) {
mHeaderAnimating = false;
updateQsState();
// Unset the listener, otherwise this may persist for another view property animation
getView().animate().setListener(null);
}
};

3
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -717,6 +717,9 @@ public class KeyguardIndicationController {
textView.setTranslationY(BOUNCE_ANIMATION_FINAL_Y);
ViewClippingUtil.setClippingDeactivated(textView, false,
mClippingParams);
// Unset the listener, otherwise this may persist for
// another view property animation
textView.animate().setListener(null);
}
});
}

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/LightsOutNotifController.java
View File

@@ -124,6 +124,9 @@ public class LightsOutNotifController {
public void onAnimationEnd(Animator a) {
mLightsOutNotifView.setAlpha(showDot ? 1 : 0);
mLightsOutNotifView.setVisibility(showDot ? View.VISIBLE : View.GONE);
// Unset the listener, otherwise this may persist for
// another view property animation
mLightsOutNotifView.animate().setListener(null);
}
})
.start();

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsButton.java
View File

@@ -120,6 +120,9 @@ public class SettingsButton extends AlphaOptimizedImageButton {
setAlpha(1f);
setTranslationX(0);
cancelLongClick();
// Unset the listener, otherwise this may persist for
// another view property animation
animate().setListener(null);
}
@Override