am c7cd2cb2: Add callback which got missed in refactor

* commit 'c7cd2cb28f0d08dd47c79007794fc37036210b6a': Add callback which got missed in refactor
2014-11-18 23:34:06 +00:00
parent bbe305af2e c7cd2cb28f
commit ee7dd76bbb
1 changed files with 11 additions and 2 deletions
@@ -737,8 +737,7 @@ public class Launcher extends Activity
        return screenId;
    }

-    @Override
-    protected void onActivityResult(
+    private void handleActivityResult(
            final int requestCode, final int resultCode, final Intent data) {
        // Reset the startActivity waiting flag
        setWaitingForResult(false);
@@ -871,6 +870,16 @@ public class Launcher extends Activity
                    ON_ACTIVITY_RESULT_ANIMATION_DELAY, false);
        }
        mDragLayer.clearAnimatedView();
+
+    }
+
+    @Override
+    protected void onActivityResult(
+            final int requestCode, final int resultCode, final Intent data) {
+        handleActivityResult(requestCode, resultCode, data);
+        if (mLauncherCallbacks != null) {
+            mLauncherCallbacks.onActivityResult(requestCode, resultCode, data);
+        }
    }

    private PendingAddArguments preparePendingAddArgs(int requestCode, Intent data, int