Merge "Made usages of animate().setListener() call safer" into sc-v2-dev am:... (08d2e4f5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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();