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

Commit a883fb5f authored by Kevin Chyn's avatar Kevin Chyn
Browse files

1/n: Rename FingerprintDialogView to BiometricDialogView 

This is to preserve git history, see other changes in the topic :)

Bug: 111461540

Test: BiometricPromptDemo works
Change-Id: I5c7b45024743bf5c5ccf0ccb7e30b97ab24ca2bc
parent e0ef793d

packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import com.android.systemui.statusbar.CommandQueue; 


/**

 * Receives messages sent from AuthenticationClient and shows the appropriate biometric UI (e.g.

 * FingerprintDialogView).

 * BiometricDialogView).

 */

public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callbacks {

    private static final String TAG = "BiometricDialogImpl";
@@ -48,7 +48,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
    private static final int MSG_USER_CANCELED = 7;

    private static final int MSG_BUTTON_POSITIVE = 8;



    private FingerprintDialogView mDialogView;

    private BiometricDialogView mDialogView;

    private WindowManager mWindowManager;

    private IBiometricPromptReceiver mReceiver;

    private boolean mDialogShowing;
@@ -116,7 +116,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
        }

        getComponent(CommandQueue.class).addCallbacks(this);

        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mDialogView = new FingerprintDialogView(mContext, mCallback);

        mDialogView = new BiometricDialogView(mContext, mCallback);

    }



    @Override

packages/SystemUI/src/com/android/systemui/biometrics/FingerprintDialogView.java→packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java

+6 −6
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ import com.android.systemui.R; 
 * Application Icon, Title, Subtitle, Description, Fingerprint Icon, Error/Help message area,

 * and positive/negative buttons.

 */

public class FingerprintDialogView extends LinearLayout {

public class BiometricDialogView extends LinearLayout {



    private static final String TAG = "FingerprintDialogView";

    private static final String TAG = "BiometricDialogView";



    private static final int ANIMATION_DURATION_SHOW = 250; // ms

    private static final int ANIMATION_DURATION_AWAY = 350; // ms
@@ -114,7 +114,7 @@ public class FingerprintDialogView extends LinearLayout { 
        }

    };



    public FingerprintDialogView(Context context, DialogViewCallback callback) {

    public BiometricDialogView(Context context, DialogViewCallback callback) {

        super(context);

        mCallback = callback;

        mLinearOutSlowIn = Interpolators.LINEAR_OUT_SLOW_IN;
@@ -257,7 +257,7 @@ public class FingerprintDialogView extends LinearLayout { 
        final Runnable endActionRunnable = new Runnable() {

            @Override

            public void run() {

                mWindowManager.removeView(FingerprintDialogView.this);

                mWindowManager.removeView(BiometricDialogView.this);

                mAnimatingAway = false;

            }

        };
@@ -290,7 +290,7 @@ public class FingerprintDialogView extends LinearLayout { 
    public void forceRemove() {

        mLayout.animate().cancel();

        mDialog.animate().cancel();

        mWindowManager.removeView(FingerprintDialogView.this);

        mWindowManager.removeView(BiometricDialogView.this);

        mAnimatingAway = false;

        mWasForceRemoved = true;

    }
@@ -393,7 +393,7 @@ public class FingerprintDialogView extends LinearLayout { 
                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,

                PixelFormat.TRANSLUCENT);

        lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

        lp.setTitle("FingerprintDialogView");

        lp.setTitle("BiometricDialogView");

        lp.token = mWindowToken;

        return lp;

    }