summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson <winsonc@google.com>2015-08-31 18:32:38 (GMT)
committerWinson <winsonc@google.com>2015-08-31 18:32:38 (GMT)
commit16615f29f60b180476b3dbdf73936de418e46f10 (patch)
treea08ebc1e69f7062466b806fe0536f134f5c49370
parenta79b18ad36ca9025ac4862c492260a656f61c7cf (diff)
downloadandroid_packages_apps_Trebuchet-16615f29f60b180476b3dbdf73936de418e46f10.zip
android_packages_apps_Trebuchet-16615f29f60b180476b3dbdf73936de418e46f10.tar.gz
android_packages_apps_Trebuchet-16615f29f60b180476b3dbdf73936de418e46f10.tar.bz2
Adding workaround for regression caused by ag/752175
Change-Id: I92617c88f17a5827454e147f93d822975587d5b4
-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 6f2458c..24e9f14 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1857,6 +1857,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.
@@ -1910,8 +1912,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() {