Merge changes from topic "am-6756c3c9-4e27-48e1-8ae4-b6d5cdd77952" into ub-launcher3-edmonton-polish
* changes:
[automerger] Adding a pending invisibility flag, which is used to indicate that the launcher is not really invisible, but consider it invisible for window transitions am: 1c63c72c1a
Adding a pending invisibility flag, which is used to indicate that the launcher is not really invisible, but consider it invisible for window transitions
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 5b010dc..8a15b24 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -242,8 +242,10 @@
* Called when the start transition ends and the user settles on this particular state.
*/
public void onStateTransitionEnd(Launcher launcher) {
- if (this == NORMAL) {
+ if (this == NORMAL || this == SPRING_LOADED) {
UiFactory.resetOverview(launcher);
+ }
+ if (this == NORMAL) {
// Clear any rotation locks when going to normal state
launcher.getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
}