Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Execute show overlay method immediatly." into sc-dev am: 7aafe8e0d1

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

Change-Id: I6443ed4449d7a19bb13ccc09e7c2aa157c6f1c07
This commit is contained in:
Joe Bolinger
2021-06-30 16:59:01 +00:00
committed by Automerger Merge Worker
parent c53362029a 7aafe8e0d1
commit 727bf73503
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
View File

@@ -596,8 +596,10 @@ public class UdfpsController implements DozeReceiver {
} }
private void updateOverlay() { private void updateOverlay() {
mExecution.assertIsMainThread();
if (mServerRequest != null) { if (mServerRequest != null) {
showUdfpsOverlay(mServerRequest.mRequestReason); showUdfpsOverlay(mServerRequest);
} else { } else {
hideUdfpsOverlay(); hideUdfpsOverlay();
} }
@@ -658,36 +660,37 @@ public class UdfpsController implements DozeReceiver {
updateOverlay(); updateOverlay();
} }
private void showUdfpsOverlay(int reason) { private void showUdfpsOverlay(@NonNull ServerRequest request) {
mFgExecutor.execute(() -> { mExecution.assertIsMainThread();
if (mView == null) {
try {
Log.v(TAG, "showUdfpsOverlay | adding window reason=" + reason);
mView = (UdfpsView) mInflater.inflate(R.layout.udfps_view, null, false);
mView.setSensorProperties(mSensorProps);
mView.setHbmProvider(mHbmProvider);
UdfpsAnimationViewController animation = inflateUdfpsAnimation(reason);
animation.init();
mView.setAnimationViewController(animation);
// This view overlaps the sensor area, so prevent it from being selectable final int reason = request.mRequestReason;
// during a11y. if (mView == null) {
if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR try {
|| reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) { Log.v(TAG, "showUdfpsOverlay | adding window reason=" + reason);
mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); mView = (UdfpsView) mInflater.inflate(R.layout.udfps_view, null, false);
} mView.setSensorProperties(mSensorProps);
mView.setHbmProvider(mHbmProvider);
UdfpsAnimationViewController animation = inflateUdfpsAnimation(reason);
animation.init();
mView.setAnimationViewController(animation);
mWindowManager.addView(mView, computeLayoutParams(animation)); // This view overlaps the sensor area, so prevent it from being selectable
mAccessibilityManager.addTouchExplorationStateChangeListener( // during a11y.
mTouchExplorationStateChangeListener); if (reason == IUdfpsOverlayController.REASON_ENROLL_FIND_SENSOR
updateTouchListener(); || reason == IUdfpsOverlayController.REASON_ENROLL_ENROLLING) {
} catch (RuntimeException e) { mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
Log.e(TAG, "showUdfpsOverlay | failed to add window", e);
} }
} else {
Log.v(TAG, "showUdfpsOverlay | the overlay is already showing"); mWindowManager.addView(mView, computeLayoutParams(animation));
mAccessibilityManager.addTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
updateTouchListener();
} catch (RuntimeException e) {
Log.e(TAG, "showUdfpsOverlay | failed to add window", e);
} }
}); } else {
Log.v(TAG, "showUdfpsOverlay | the overlay is already showing");
}
} }
private UdfpsAnimationViewController inflateUdfpsAnimation(int reason) { private UdfpsAnimationViewController inflateUdfpsAnimation(int reason) {