diff options
author | ztenghui <ztenghui@google.com> | 2015-05-26 14:53:41 -0700 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2015-06-04 12:55:23 -0700 |
commit | 4d1bec4730ab13a93f50dbfcbe965b6e76eb5774 (patch) | |
tree | 9e333aa3f56998bb3342e35b7d72a1ee52b1f030 /src/com/android/settings/fingerprint | |
parent | 0ad408e646fe6d8f75286a2838bf640d79fcf2ea (diff) | |
download | packages_apps_Settings-4d1bec4730ab13a93f50dbfcbe965b6e76eb5774.zip packages_apps_Settings-4d1bec4730ab13a93f50dbfcbe965b6e76eb5774.tar.gz packages_apps_Settings-4d1bec4730ab13a93f50dbfcbe965b6e76eb5774.tar.bz2 |
Setup the animation callback for AnimatedVectorDrawable
b/21341096
Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
Diffstat (limited to 'src/com/android/settings/fingerprint')
-rw-r--r-- | src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index a0a5003..886cdb2 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -17,14 +17,15 @@ package com.android.settings.fingerprint; import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.Animatable2; import android.graphics.drawable.AnimatedVectorDrawable; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; @@ -82,7 +83,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar); mFingerprintAnimator = (ImageView) findViewById(R.id.fingerprint_animator); mIconAnimationDrawable = (AnimatedVectorDrawable) mFingerprintAnimator.getDrawable(); - mIconAnimationDrawable.addListener(mIconAnimationListener); + mIconAnimationDrawable.registerAnimationCallback(mIconAnimationCallback); mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator( this, android.R.interpolator.fast_out_slow_in); mFingerprintAnimator.setOnTouchListener(new View.OnTouchListener() { @@ -248,9 +249,10 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase } }; - private final Animator.AnimatorListener mIconAnimationListener = new AnimatorListenerAdapter() { + private final Animatable2.AnimationCallback mIconAnimationCallback = + new Animatable2.AnimationCallback() { @Override - public void onAnimationEnd(Animator animation) { + public void onAnimationEnd(Drawable d) { if (mAnimationCancelled) { return; } |