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

Delay registering of callbacks until bouncer is created

Browse Source 
Bug: 149188153
Test: manual (build, boot, set lockscreen, show keyguard), atest
SystemUITests

Change-Id: I46b50f1e937746e937de78b01edb5cc7c4cf37b3
This commit is contained in:
Heemin Seog
2020-02-11 14:09:19 -08:00
parent da9c28740d
commit e2e77a0d54
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;
import static android.view.ViewRootImpl.sNewInsetsMode;
import static android.view.WindowInsets.Type.navigationBars;
import static com.android.systemui.plugins.ActivityStarter.OnDismissAction;
import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_UNLOCK_FADING;
import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK;
@@ -95,6 +96,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
private static String TAG = "StatusBarKeyguardViewManager";
protected final Context mContext;
private final ConfigurationController mConfigurationController;
private final NavigationModeController mNavigationModeController;
private final NotificationShadeWindowController mNotificationShadeWindowController;
private final BouncerExpansionCallback mExpansionCallback = new BouncerExpansionCallback() {
@Override
@@ -208,21 +211,14 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mContext = context;
mViewMediatorCallback = callback;
mLockPatternUtils = lockPatternUtils;
mConfigurationController = configurationController;
mNavigationModeController = navigationModeController;
mNotificationShadeWindowController = notificationShadeWindowController;
mKeyguardStateController = keyguardStateController;
mMediaManager = notificationMediaManager;
mKeyguardUpdateManager = keyguardUpdateMonitor;
mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);
mStatusBarStateController = sysuiStatusBarStateController;
mStatusBarStateController.addCallback(this);
configurationController.addCallback(this);
mGesturalNav = QuickStepContract.isGesturalMode(
navigationModeController.addListener(this));
mDockManager = dockManager;
if (mDockManager != null) {
mDockManager.addListener(mDockEventListener);
mIsDocked = mDockManager.isDocked();
}
}
public void registerStatusBar(StatusBar statusBar,
@@ -246,6 +242,20 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
notificationPanelViewController.addExpansionListener(this);
mBypassController = bypassController;
mNotificationContainer = notificationContainer;
registerListeners();
}
private void registerListeners() {
mKeyguardUpdateManager.registerCallback(mUpdateMonitorCallback);
mStatusBarStateController.addCallback(this);
mConfigurationController.addCallback(this);
mGesturalNav = QuickStepContract.isGesturalMode(
mNavigationModeController.addListener(this));
if (mDockManager != null) {
mDockManager.addListener(mDockEventListener);
mIsDocked = mDockManager.isDocked();
}
}
@Override