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

Browse Source
This commit is contained in:
Beverly Tai
2022-03-22 15:33:15 +00:00
committed by Android (Google) Code Review
parent fa5aefba20 746cd79b37
commit f6cfe35b2f
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(); updateBurnInOffsets();
updateVisibility(); updateVisibility();
mAccessibilityManager.addTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
updateAccessibility(); updateAccessibility();
} }
private void updateAccessibility() { private void updateAccessibility() {
if (mAccessibilityManager.isTouchExplorationEnabled()) { if (mAccessibilityManager.isTouchExplorationEnabled()) {
mView.setOnClickListener( mView.setOnClickListener(mA11yClickListener);
new View.OnClickListener() {
@Override
public void onClick(View v) {
onLongPress();
}
}
);
} else { } else {
mView.setOnClickListener(null); mView.setOnClickListener(null);
} }
@@ -242,6 +237,9 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mCancelDelayedUpdateVisibilityRunnable.run(); mCancelDelayedUpdateVisibilityRunnable.run();
mCancelDelayedUpdateVisibilityRunnable = null; mCancelDelayedUpdateVisibilityRunnable = null;
} }
mAccessibilityManager.removeTouchExplorationStateChangeListener(
mTouchExplorationStateChangeListener);
} }
public float getTop() { public float getTop() {
@@ -267,7 +265,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
return; return;
} }
boolean wasShowingUnlock = mShowUnlockIcon;
boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon
&& !mShowAodUnlockedIcon && !mShowAodLockIcon; && !mShowAodUnlockedIcon && !mShowAodLockIcon;
mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen() mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen()
@@ -702,6 +699,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mView.setAlpha(alpha); 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() { private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() {
@Override @Override
public void onAllAuthenticatorsRegistered() { public void onAllAuthenticatorsRegistered() {
@@ -714,11 +719,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
} }
}; };
private void updateUdfpsConfig() { private final View.OnClickListener mA11yClickListener = v -> onLongPress();
// must be called from the main thread since it may update the views
mExecutor.execute(() -> { private final AccessibilityManager.TouchExplorationStateChangeListener
updateIsUdfpsEnrolled(); mTouchExplorationStateChangeListener = enabled -> updateAccessibility();
updateConfiguration();
});
}
} }