diff options
| author | Ivan Lee <ivanylee@google.com> | 2015-09-03 10:16:07 -0600 |
|---|---|---|
| committer | Ivan Lee <ivanylee@google.com> | 2015-09-03 10:16:07 -0600 |
| commit | 667d6888f4a7f1a6267c1968f22fdb8ff3af8d34 (patch) | |
| tree | 5bdf9b8ca44f7eba05a35fde8acac25b3460bbfd /src/com | |
| parent | 7412c3cb005c3b3315ddb276386e2115f742d2e0 (diff) | |
| download | android_packages_apps_Trebuchet-667d6888f4a7f1a6267c1968f22fdb8ff3af8d34.tar.gz android_packages_apps_Trebuchet-667d6888f4a7f1a6267c1968f22fdb8ff3af8d34.tar.bz2 android_packages_apps_Trebuchet-667d6888f4a7f1a6267c1968f22fdb8ff3af8d34.zip | |
Revert workaround for move to default screen on home intent.
BUG=23556755
Change-Id: Ia268a58389b90fd0503e474f02f33a312c051c0e
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files 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() { |