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

Merge "Update lock icon a11y click handler on a11y change" into tm-dev am: f6cfe35b2f

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

Change-Id: Ic18d91fc0a9d3e4fcacbe409bfdb7e8dbd19ee9a
This commit is contained in:
Beverly Tai
2022-03-22 15:50:56 +00:00
committed by Automerger Merge Worker
parent d2a8402306 f6cfe35b2f
commit c12be66bc5
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -212,19 +212,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
updateBurnInOffsets();
updateVisibility();
mAccessibilityManager.addTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
updateAccessibility();
}
private void updateAccessibility() {
if (mAccessibilityManager.isTouchExplorationEnabled()) {
mView.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
onLongPress();
}
}
);
mView.setOnClickListener(mA11yClickListener);
} else {
mView.setOnClickListener(null);
}
@@ -242,6 +237,9 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mCancelDelayedUpdateVisibilityRunnable.run();
mCancelDelayedUpdateVisibilityRunnable = null;
}
mAccessibilityManager.removeTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
}
public float getTop() {
@@ -267,7 +265,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
return;
}
boolean wasShowingUnlock = mShowUnlockIcon;
boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon
&& !mShowAodUnlockedIcon && !mShowAodLockIcon;
mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen()
@@ -702,6 +699,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mView.setAlpha(alpha);
}
private void updateUdfpsConfig() {
// must be called from the main thread since it may update the views
mExecutor.execute(() -> {
updateIsUdfpsEnrolled();
updateConfiguration();
});
}
private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() {
@Override
public void onAllAuthenticatorsRegistered() {
@@ -714,11 +719,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
}
};
private void updateUdfpsConfig() {
// must be called from the main thread since it may update the views
mExecutor.execute(() -> {
updateIsUdfpsEnrolled();
updateConfiguration();
});
}
private final View.OnClickListener mA11yClickListener = v -> onLongPress();
private final AccessibilityManager.TouchExplorationStateChangeListener
mTouchExplorationStateChangeListener = enabled -> updateAccessibility();
}