PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add callback which got missed in refactor

Browse Source 
Bug 18418855

Change-Id: Ia3a1cec76721bbbc118dd7389b5e960802a64b88
This commit is contained in:
Adam Cohen
2014-11-17 17:45:34 -08:00
parent 0e974b4d44
commit c7cd2cb28f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+11 -2
View File
@@ -737,8 +737,7 @@ public class Launcher extends Activity
return screenId; return screenId;
} }
@Override private void handleActivityResult(
protected void onActivityResult(
final int requestCode, final int resultCode, final Intent data) { final int requestCode, final int resultCode, final Intent data) {
// Reset the startActivity waiting flag // Reset the startActivity waiting flag
setWaitingForResult(false); setWaitingForResult(false);
@@ -871,6 +870,16 @@ public class Launcher extends Activity
ON_ACTIVITY_RESULT_ANIMATION_DELAY, false); ON_ACTIVITY_RESULT_ANIMATION_DELAY, false);
} }
mDragLayer.clearAnimatedView(); 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 private PendingAddArguments preparePendingAddArgs(int requestCode, Intent data, int