Add callback which got missed in refactor

Bug 18418855 Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
2014-11-17 17:45:34 -08:00
parent 0e974b4d44
commit c7cd2cb28f
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