commit 25c7e81ee5b7a59774dc9d73951aa7ffd71d01a9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 05 23:55:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 05 23:55:46 2018 +0000
tree 9e6e1733050392d79e640dbdf2e9ff5c66e2e749
parent b72f69d0733ba44dd103db16b1a43036856830e8
parent 4bd472550c7360a86dc7f86067da5942b222e519

Merge "Fix wrong labeling of app launch session type (HOME vs OVERVIEW)" into ub-launcher3-edmonton-polish

src/com/android/launcher3/LauncherState.java

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);
         }