diff options
| author | Winson Chung <winsonc@google.com> | 2019-09-06 12:05:52 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2019-09-09 10:24:53 -0700 |
| commit | ef52876739c65b740c0205cb49aaafd5cae3b7fa (patch) | |
| tree | 84970a4fab0331489606b276d52ba6ef5e9b7189 /src/com/android/launcher3/LauncherStateManager.java | |
| parent | 13c1c2cd6505ca3103d4a2d315426e301a871337 (diff) | |
| download | android_packages_apps_Trebuchet-ef52876739c65b740c0205cb49aaafd5cae3b7fa.tar.gz android_packages_apps_Trebuchet-ef52876739c65b740c0205cb49aaafd5cae3b7fa.tar.bz2 android_packages_apps_Trebuchet-ef52876739c65b740c0205cb49aaafd5cae3b7fa.zip | |
Defer listening on widget host until after the state transition ends
Bug: 140246642
Change-Id: I4532e4298f04ff5c6dea04ccda89320995cadb80
Diffstat (limited to 'src/com/android/launcher3/LauncherStateManager.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 63914b0eb..6bfae1311 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -136,7 +136,7 @@ public class LauncherStateManager { } public void dump(String prefix, PrintWriter writer) { - writer.println(prefix + "LauncherState"); + writer.println(prefix + "LauncherState:"); writer.println(prefix + "\tmLastStableState:" + mLastStableState); writer.println(prefix + "\tmCurrentStableState:" + mCurrentStableState); writer.println(prefix + "\tmState:" + mState); @@ -418,7 +418,7 @@ public class LauncherStateManager { " @ " + Log.getStackTraceString(new Throwable())); } mState.onStateEnabled(mLauncher); - mLauncher.onStateSet(mState); + mLauncher.onStateSetStart(mState); if (state.disablePageClipping) { // Only disable clipping if needed, otherwise leave it as previous value. @@ -444,8 +444,7 @@ public class LauncherStateManager { } state.onStateTransitionEnd(mLauncher); - mLauncher.getWorkspace().setClipChildren(!state.disablePageClipping); - mLauncher.finishAutoCancelActionMode(); + mLauncher.onStateSetEnd(state); if (state == NORMAL) { setRestState(null); |