Merge "Implement handling of My Photos wallpapers" into ub-launcher3-master (7de1e778) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/picker/CustomizationPickerActivity.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -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 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal
		}
		}

		@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