From c7cd2cb28f0d08dd47c79007794fc37036210b6a Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 17 Nov 2014 17:45:34 -0800
Subject: Add callback which got missed in refactor

Bug 18418855

Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
---
 src/com/android/launcher3/Launcher.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 22db3ac4d..0d1d3ef6e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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
-- 
cgit v1.2.3