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

Merge "Fix Accessibility Shortcut does not show up while SystemUI restart" into tm-dev

Browse Source
This commit is contained in:
Menghan Li
2022-04-20 06:15:01 +00:00
committed by Android (Google) Code Review
parent 7fa2bca312 42351563a2
commit f24ce1cacd
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java
View File

@@ -51,27 +51,20 @@ public class AccessibilityFloatingMenuController implements
private int mBtnMode; private int mBtnMode;
private String mBtnTargets; private String mBtnTargets;
private boolean mIsKeyguardVisible; private boolean mIsKeyguardVisible;
private boolean mIsAccessibilityManagerServiceReady;
@VisibleForTesting @VisibleForTesting
final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() { final KeyguardUpdateMonitorCallback mKeyguardCallback = new KeyguardUpdateMonitorCallback() {
// Accessibility floating menu needs to retrieve information from
// AccessibilityManagerService, and it would be ready before onUserUnlocked().
@Override @Override
public void onUserUnlocked() { public void onUserUnlocked() {
mIsAccessibilityManagerServiceReady = true;
handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets); handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
} }
// Keyguard state would be changed before AccessibilityManagerService is ready to retrieve,
// need to wait until receive onUserUnlocked().
@Override @Override
public void onKeyguardVisibilityChanged(boolean showing) { public void onKeyguardVisibilityChanged(boolean showing) {
mIsKeyguardVisible = showing; mIsKeyguardVisible = showing;
if (mIsAccessibilityManagerServiceReady) {
handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets); handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
} }
}
@Override @Override
public void onUserSwitching(int userId) { public void onUserSwitching(int userId) {
@@ -99,7 +92,6 @@ public class AccessibilityFloatingMenuController implements
mKeyguardUpdateMonitor = keyguardUpdateMonitor; mKeyguardUpdateMonitor = keyguardUpdateMonitor;
mIsKeyguardVisible = false; mIsKeyguardVisible = false;
mIsAccessibilityManagerServiceReady = false;
} }
/** /**