Revert "Get enrollment animation from overlay"

This reverts commit 9ed7cb40cb.

Bug: 111548033
Bug: 121222038
Change-Id: Ic9c85628c45ea5327d0d3b6969034c13789b920c
This commit is contained in:
Kevin Chyn
2018-12-21 18:20:19 +00:00
parent 6b17d51070
commit 4cedaafe0e
9 changed files with 25 additions and 117 deletions

View File

@@ -35,7 +35,7 @@ import java.util.List;
* are updated/drawn in a special order so that the overlap is correct during the final completion
* effect.
*/
public class ParticleCollection implements FaceFeatureProviderImpl.EnrollingAnimation {
public class ParticleCollection implements BiometricEnrollSidecar.Listener {
private static final String TAG = "AnimationController";
@@ -49,7 +49,11 @@ public class ParticleCollection implements FaceFeatureProviderImpl.EnrollingAnim
private final List<AnimationParticle> mParticleList;
private final List<Integer> mPrimariesInProgress; // primary particles not done animating yet
private int mState;
private FaceFeatureProvider.Listener mListener;
private Listener mListener;
public interface Listener {
void onEnrolled();
}
private final AnimationParticle.Listener mParticleListener = new AnimationParticle.Listener() {
@Override
@@ -68,8 +72,7 @@ public class ParticleCollection implements FaceFeatureProviderImpl.EnrollingAnim
}
};
public ParticleCollection(Context context, FaceFeatureProvider.Listener listener, Rect bounds,
int borderWidth) {
public ParticleCollection(Context context, Listener listener, Rect bounds, int borderWidth) {
mParticleList = new ArrayList<>();
mListener = listener;
@@ -100,14 +103,12 @@ public class ParticleCollection implements FaceFeatureProviderImpl.EnrollingAnim
updateState(STATE_STARTED);
}
@Override
public void update(long t, long dt) {
for (int i = 0; i < mParticleList.size(); i++) {
mParticleList.get(i).update(t, dt);
}
}
@Override
public void draw(Canvas canvas) {
for (int i = 0; i < mParticleList.size(); i++) {
mParticleList.get(i).draw(canvas);