Merge "Implement handling of My Photos wallpapers" into ub-launcher3-master
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 2529395..7a35b7d 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -15,6 +15,7 @@
*/
package com.android.customization.picker;
+import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
@@ -281,6 +282,20 @@
}
}
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (mDelegate.handleActivityResult(requestCode, resultCode, data)) {
+ finishActivityWithResultOk();
+ }
+ }
+
+ private void finishActivityWithResultOk() {
+ overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
+ setResult(Activity.RESULT_OK);
+ finish();
+ }
+
/**
* Represents a section of the Picker (eg "ThemeBundle", "Clock", etc).
* There should be a concrete subclass per available section, providing the corresponding