Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30c2ebf authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Ensure face icon controller is deactivated when view is detached" into...

Merge "Ensure face icon controller is deactivated when view is detached" into sc-v2-dev am: 5f833103

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935606

Change-Id: Ia43c5429ebcd201a73e5930058efae8764205ad6
parents 7d64542b 5f833103
Loading
Loading
Loading
Loading
+15 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.systemui.biometrics;

import android.annotation.NonNull;
import android.content.Context;
import android.graphics.drawable.Animatable2;
import android.graphics.drawable.AnimatedVectorDrawable;
@@ -30,6 +29,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import com.android.internal.annotations.VisibleForTesting;
@@ -163,6 +163,18 @@ public class AuthBiometricFaceView extends AuthBiometricView {
    }

    @Nullable @VisibleForTesting IconController mFaceIconController;
    @NonNull private final OnAttachStateChangeListener mOnAttachStateChangeListener =
            new OnAttachStateChangeListener() {
        @Override
        public void onViewAttachedToWindow(View v) {

        }

        @Override
        public void onViewDetachedFromWindow(View v) {
            mFaceIconController.deactivate();
        }
    };

    public AuthBiometricFaceView(Context context) {
        this(context, null);
@@ -181,6 +193,8 @@ public class AuthBiometricFaceView extends AuthBiometricView {
    protected void onFinishInflate() {
        super.onFinishInflate();
        mFaceIconController = new IconController(mContext, mIconView, mIndicatorView);

        addOnAttachStateChangeListener(mOnAttachStateChangeListener);
    }

    @Override