Merge "Immediately show bouncer on disabled udfps touch" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-04-05 14:10:49 +00:00
committed by Android (Google) Code Review

View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable; import android.graphics.drawable.InsetDrawable;
import android.hardware.biometrics.BiometricSourceType; import android.hardware.biometrics.BiometricSourceType;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -73,7 +74,7 @@ public class DisabledUdfpsController extends ViewController<DisabledUdfpsView> i
@NonNull KeyguardStateController keyguardStateController @NonNull KeyguardStateController keyguardStateController
) { ) {
super(view); super(view);
mView.setOnClickListener(mOnClickListener); mView.setOnTouchListener(mOnTouchListener);
mView.setSensorProperties(authController.getUdfpsProps().get(0)); mView.setSensorProperties(authController.getUdfpsProps().get(0));
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
@@ -153,11 +154,11 @@ public class DisabledUdfpsController extends ViewController<DisabledUdfpsView> i
pw.println(" mCanDismissLockScreen: " + mCanDismissLockScreen); pw.println(" mCanDismissLockScreen: " + mCanDismissLockScreen);
} }
private final View.OnClickListener mOnClickListener = new View.OnClickListener() { private final View.OnTouchListener mOnTouchListener = new View.OnTouchListener() {
@Override @Override
public void onClick(View v) { public boolean onTouch(View v, MotionEvent event) {
// if the device is locked, shows bouncer, else goes to launcher
mKeyguardViewController.showBouncer(/* scrim */ true); mKeyguardViewController.showBouncer(/* scrim */ true);
return true;
} }
}; };