summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-08-31 18:40:41 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-31 18:40:41 (GMT)
commit1b247d9f37cd1e9ca9e8c690c137858b66314b79 (patch)
tree1ad51237410c8f87bf76e9914a3c6ab42f7a8bfa
parent8b0af4c635a116dea90555dd60cc23444dab3e64 (diff)
parent16615f29f60b180476b3dbdf73936de418e46f10 (diff)
downloadandroid_packages_apps_Trebuchet-1b247d9f37cd1e9ca9e8c690c137858b66314b79.zip
android_packages_apps_Trebuchet-1b247d9f37cd1e9ca9e8c690c137858b66314b79.tar.gz
android_packages_apps_Trebuchet-1b247d9f37cd1e9ca9e8c690c137858b66314b79.tar.bz2
Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 2 insertions, 2 deletions
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 @@ 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.
@@ -1918,8 +1920,6 @@ 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() {