diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-11-17 17:45:34 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-11-17 23:02:52 -0800 |
| commit | c7cd2cb28f0d08dd47c79007794fc37036210b6a (patch) | |
| tree | 487ce1d2db6708f3546f13fb85f2f3b8a190e692 /src | |
| parent | 0e974b4d4480242c768cbd886d02ea66c0c8643d (diff) | |
| download | android_packages_apps_Trebuchet-c7cd2cb28f0d08dd47c79007794fc37036210b6a.tar.gz android_packages_apps_Trebuchet-c7cd2cb28f0d08dd47c79007794fc37036210b6a.tar.bz2 android_packages_apps_Trebuchet-c7cd2cb28f0d08dd47c79007794fc37036210b6a.zip | |
Add callback which got missed in refactor
Bug 18418855
Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 13 |
1 files changed, 11 insertions, 2 deletions
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 |