diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-12 23:16:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-12 23:16:59 +0000 |
commit | 3d6e96d5265cdea78ad4e01b0f9fde0eea539094 (patch) | |
tree | fe81d0cab304602b4cbdbb6bcdb97fdc167df972 /quickstep/src | |
parent | 964d16470958fd7ace6de4cf1b0987b4734754ee (diff) | |
parent | a0f9110e5200f0d00114b8657d42fff074563d47 (diff) | |
download | android_packages_apps_Trebuchet-3d6e96d5265cdea78ad4e01b0f9fde0eea539094.tar.gz android_packages_apps_Trebuchet-3d6e96d5265cdea78ad4e01b0f9fde0eea539094.tar.bz2 android_packages_apps_Trebuchet-3d6e96d5265cdea78ad4e01b0f9fde0eea539094.zip |
Merge "Adding support for custom callback when starting ProxyActivity" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/src')
-rw-r--r-- | quickstep/src/com/android/launcher3/proxy/StartActivityParams.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java b/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java index 1e8bd933f..bee8bb813 100644 --- a/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java +++ b/quickstep/src/com/android/launcher3/proxy/StartActivityParams.java @@ -31,7 +31,7 @@ public class StartActivityParams implements Parcelable { private static final String TAG = "StartActivityParams"; - private final PendingIntent mCallback; + private final PendingIntent mPICallback; public final int requestCode; public Intent intent; @@ -44,13 +44,17 @@ public class StartActivityParams implements Parcelable { public Bundle options; public StartActivityParams(Activity activity, int requestCode) { - mCallback = activity.createPendingResult(requestCode, new Intent(), - PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT); + this(activity.createPendingResult(requestCode, new Intent(), + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT), requestCode); + } + + public StartActivityParams(PendingIntent pendingIntent, int requestCode) { + this.mPICallback = pendingIntent; this.requestCode = requestCode; } private StartActivityParams(Parcel parcel) { - mCallback = parcel.readTypedObject(PendingIntent.CREATOR); + mPICallback = parcel.readTypedObject(PendingIntent.CREATOR); requestCode = parcel.readInt(); intent = parcel.readTypedObject(Intent.CREATOR); @@ -70,7 +74,7 @@ public class StartActivityParams implements Parcelable { @Override public void writeToParcel(Parcel parcel, int flags) { - parcel.writeTypedObject(mCallback, flags); + parcel.writeTypedObject(mPICallback, flags); parcel.writeInt(requestCode); parcel.writeTypedObject(intent, flags); @@ -84,7 +88,9 @@ public class StartActivityParams implements Parcelable { public void deliverResult(Context context, int resultCode, Intent data) { try { - mCallback.send(context, resultCode, data); + if (mPICallback != null) { + mPICallback.send(context, resultCode, data); + } } catch (CanceledException e) { Log.e(TAG, "Unable to send back result", e); } |