commit 1b247d9f37cd1e9ca9e8c690c137858b66314b79
author Winson Chung <winsonc@google.com> Mon Aug 31 18:40:41 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 18:40:41 2015 +0000
tree 1ad51237410c8f87bf76e9914a3c6ab42f7a8bfa
parent 8b0af4c635a116dea90555dd60cc23444dab3e64
parent 16615f29f60b180476b3dbdf73936de418e46f10

Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1f843cb..2873d37 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1865,6 +1865,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.
@@ -1918,8 +1920,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() {