From 667d6888f4a7f1a6267c1968f22fdb8ff3af8d34 Mon Sep 17 00:00:00 2001 From: Ivan Lee Date: Thu, 3 Sep 2015 10:16:07 -0600 Subject: Revert workaround for move to default screen on home intent. BUG=23556755 Change-Id: Ia268a58389b90fd0503e474f02f33a312c051c0e --- src/com/android/launcher3/Launcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2873d3733..1f843cb70 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1865,8 +1865,6 @@ public class Launcher extends Activity 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. @@ -1920,6 +1918,8 @@ public class Launcher extends Activity // 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() { -- cgit v1.2.3