From 2bf24b39f00df7fe9d0025ebb3c9a0017d886331 Mon Sep 17 00:00:00 2001 From: Adam Cohen 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(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7b880430b..44124f9d9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -872,8 +872,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); @@ -1023,6 +1022,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