Merge "Let scanning progress loop"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a3e9de1121
@@ -21,6 +21,7 @@ import android.content.res.Configuration;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.drawable.Animatable2;
|
||||
import android.graphics.drawable.AnimatedVectorDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.util.AttributeSet;
|
||||
@@ -134,6 +135,16 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
|
||||
|
||||
if (animation != null && isAnim) {
|
||||
animation.forceAnimationOnUI();
|
||||
animation.clearAnimationCallbacks();
|
||||
animation.registerAnimationCallback(new Animatable2.AnimationCallback() {
|
||||
@Override
|
||||
public void onAnimationEnd(Drawable drawable) {
|
||||
if (getDrawable() == animation && state == getState()
|
||||
&& doesAnimationLoop(iconAnimRes)) {
|
||||
animation.start();
|
||||
}
|
||||
}
|
||||
});
|
||||
animation.start();
|
||||
}
|
||||
|
||||
@@ -215,6 +226,10 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
|
||||
return mContext.getDrawable(iconRes);
|
||||
}
|
||||
|
||||
private boolean doesAnimationLoop(int resourceId) {
|
||||
return resourceId == com.android.internal.R.anim.lock_scanning;
|
||||
}
|
||||
|
||||
private static int getAnimationResForTransition(int oldState, int newState,
|
||||
boolean wasPulsing, boolean pulsing,
|
||||
boolean wasDozing, boolean dozing) {
|
||||
|
||||
Reference in New Issue
Block a user