Merge changes from topic "am-c5545bb3-b4fc-4188-890e-09975d70878c" into ub-launcher3-master

* changes:
  [automerger] Immediate 2nd quickscrub should not cancel if same state am: f8fafa2847
  Immediate 2nd quickscrub should not cancel if same state
This commit is contained in:
TreeHugger Robot 2018-06-15 19:36:41 +00:00 committed by Android (Google) Code Review
commit 6e94ee24ce
1 changed files with 3 additions and 1 deletions

View File

@ -382,7 +382,9 @@ public class LauncherStateManager {
}
private void onStateTransitionStart(LauncherState state) {
mState.onStateDisabled(mLauncher);
if (mState != state) {
mState.onStateDisabled(mLauncher);
}
mState = state;
mState.onStateEnabled(mLauncher);
mLauncher.getAppWidgetHost().setResumed(state == LauncherState.NORMAL);