summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-11-18 01:45:34 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-28 04:05:42 (GMT)
commit2bf24b39f00df7fe9d0025ebb3c9a0017d886331 (patch)
tree372c745f38a072818c8d0a0f86824c49c9859336
parent56f2f812a4cd2f00106f535f4fce541843585ada (diff)
downloadandroid_packages_apps_Trebuchet-2bf24b39f00df7fe9d0025ebb3c9a0017d886331.zip
android_packages_apps_Trebuchet-2bf24b39f00df7fe9d0025ebb3c9a0017d886331.tar.gz
android_packages_apps_Trebuchet-2bf24b39f00df7fe9d0025ebb3c9a0017d886331.tar.bz2
Add callback which got missed in refactor
Bug 18418855 Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
-rw-r--r--src/com/android/launcher3/Launcher.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7b88043..44124f9 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