commit 16cd2a845633ba892e95f531c25a393860237be3
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 23:46:34 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 23:46:34 2018 +0000
tree 7fd9ac044272b0ac60491978626d0a089e2b8a8c
parent bf3ac479a4c17472944c94c2f8f0719b932aa5d8
parent 4bd472550c7360a86dc7f86067da5942b222e519

[automerger] Fix wrong labeling of app launch session type (HOME vs OVERVIEW) am: 4bd472550c

Change-Id: I6afc740fca72d6aa261759765bdcf75997171fc9

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