commit 01649e348142dd9c4ab81063047e2956dea3729e
author Tony Wickham <twickham@google.com> Thu Sep 03 18:12:28 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 18:12:28 2015 +0000
tree 8e96b3ca2fb1a43645b0b9c1527223faf7e3acf7
parent 2c18c8e34d0c06d95f612e865badc082a2cff0e1
parent 4dbaef024676469e60654814e7f8ee46e2943638

Merge "Change addParallaxOffset() to setParallaxOffset() in CropView." into ub-launcher3-master

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c0c4645..38f84df 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1811,8 +1811,6 @@
         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.
@@ -1866,6 +1864,8 @@
         // 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() {

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7b1ee47..f2837a0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4003,7 +4003,7 @@
 
             @Override
             public boolean evaluate(ItemInfo info, View v, View parent) {
-                return info.id == id;
+                return info != null && info.id == id;
             }
         });
     }