commit 5fc78a7d0342f499c481555e4db34d5edfa49653
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 31 18:50:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 18:50:10 2015 +0000
tree c900fb208b0839edb7d8e27214049a80a6ce7e38
parent e2824c4ea78631e41c7c82def8bd894684ac3e5f
parent de51d1d1af595849d3318871134be8dc0f0a34fd

Merge "Regression in ag/753709" into ub-launcher3-master

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8024233..03f9d06 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1833,6 +1833,8 @@
         boolean alreadyOnHome = mHasFocus && ((intent.getFlags() &
                 Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
                 != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
+        boolean moveToDefaultScreen = mLauncherCallbacks != null ?
+                mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;
         boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
         if (isActionMain) {
             // also will cancel mWaitingForResult.
@@ -1886,8 +1888,6 @@
         // as slow logic in the callbacks eat into the time the scroller expects for the snapToPage
         // animation.
         if (isActionMain) {
-            boolean moveToDefaultScreen = mLauncherCallbacks != null ?
-                    mLauncherCallbacks.shouldMoveToDefaultScreenOnHomeIntent() : true;
             if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() &&
                     openFolder == null && moveToDefaultScreen) {
                 mWorkspace.post(new Runnable() {