Merge changes from topic "presubmit-am-53b0d3f55ee24fb6807e6ffd6c335979" into tm-mainline-prod
* changes:
[automerge] Close open folders when pausing launcher. 2p: 253c23b2e8
Close open folders when pausing launcher.
This commit is contained in:
committed by
Android (Google) Code Review
commit
c09f3bc17c
@@ -1189,6 +1189,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
|||||||
mOverlayManager.onActivityResumed(this);
|
mOverlayManager.onActivityResumed(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
|
||||||
TraceHelper.INSTANCE.endSection(traceToken);
|
TraceHelper.INSTANCE.endSection(traceToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1692,9 +1693,6 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
|
|||||||
outState.remove(RUNTIME_STATE_WIDGET_PANEL);
|
outState.remove(RUNTIME_STATE_WIDGET_PANEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// We close any open folders and shortcut containers that are not safe for rebind,
|
|
||||||
// and we need to make sure this state is reflected.
|
|
||||||
AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
|
|
||||||
finishAutoCancelActionMode();
|
finishAutoCancelActionMode();
|
||||||
|
|
||||||
if (mPendingRequestArgs != null) {
|
if (mPendingRequestArgs != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user