diff options
| author | Tony Wickham <twickham@google.com> | 2021-09-04 03:13:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-04 03:13:40 +0000 |
| commit | 79ff586c105df00ea8da99604849f6f4c060ccb3 (patch) | |
| tree | d934dceb9f2ed1437ac70ee6ae1ace9e3ff19011 /quickstep/src | |
| parent | 3118d24449306c16a9b86f66cfc4f1c1d7cf4698 (diff) | |
| parent | 5a36b919b5bd91ba37f907ae98df96c2f749e094 (diff) | |
Call onUserUnlocked() before adding callbacks am: 5a36b919b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15756866
Change-Id: I03e5411032285015489f4b8bceb8b023e9c12909
Diffstat (limited to 'quickstep/src')
| -rw-r--r-- | quickstep/src/com/android/quickstep/TouchInteractionService.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 20eff34523..3ce12c53b3 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -358,12 +358,14 @@ public class TouchInteractionService extends Service implements PluginListener<O mDeviceState = new RecentsAnimationDeviceState(this, true); mDisplayManager = getSystemService(DisplayManager.class); mTaskbarManager = new TaskbarManager(this); - mRotationTouchHelper = mDeviceState.getRotationTouchHelper(); - mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged); - mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged); + + // Call runOnUserUnlocked() before any other callbacks to ensure everything is initialized. mDeviceState.runOnUserUnlocked(this::onUserUnlocked); mDeviceState.runOnUserUnlocked(mTaskbarManager::onUserUnlocked); + mDeviceState.addNavigationModeChangedCallback(this::onNavigationModeChanged); + mDeviceState.addOneHandedModeChangedCallback(this::onOneHandedModeOverlayChanged); + ProtoTracer.INSTANCE.get(this).add(this); LauncherSplitScreenListener.INSTANCE.get(this).init(); sConnected = true; |