Merge "Hook WallpaperPicker related APIs to ThemePicker" into ub-launcher3-master (deabe903) · Commits · e / os / android_packages_apps_ThemePicker

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

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,8 @@ import com.android.wallpaper.module.InjectorProvider;
	import com.android.wallpaper.module.UserEventLogger;		import com.android.wallpaper.module.UserEventLogger;
	import com.android.wallpaper.picker.CategoryFragment;		import com.android.wallpaper.picker.CategoryFragment;
	import com.android.wallpaper.picker.CategoryFragment.CategoryFragmentHost;		import com.android.wallpaper.picker.CategoryFragment.CategoryFragmentHost;
	import com.android.wallpaper.picker.MyPhotosLauncher.PermissionChangedListener;		import com.android.wallpaper.picker.MyPhotosStarter;
			import com.android.wallpaper.picker.MyPhotosStarter.PermissionChangedListener;
	import com.android.wallpaper.picker.TopLevelPickerActivity;		import com.android.wallpaper.picker.TopLevelPickerActivity;
	import com.android.wallpaper.picker.WallpaperPickerDelegate;		import com.android.wallpaper.picker.WallpaperPickerDelegate;
	import com.android.wallpaper.picker.WallpapersUiContainer;		import com.android.wallpaper.picker.WallpapersUiContainer;
	@@ -142,17 +143,17 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal

	@Override		@Override
	public void requestExternalStoragePermission(PermissionChangedListener listener) {		public void requestExternalStoragePermission(PermissionChangedListener listener) {
			mDelegate.requestExternalStoragePermission(listener);
	}		}

	@Override		@Override
	public boolean isReadExternalStoragePermissionGranted() {		public boolean isReadExternalStoragePermissionGranted() {
	return false;		return mDelegate.isReadExternalStoragePermissionGranted();
	}		}

	@Override		@Override
	public void showViewOnlyPreview(WallpaperInfo wallpaperInfo) {		public void showViewOnlyPreview(WallpaperInfo wallpaperInfo) {
			mDelegate.showViewOnlyPreview(wallpaperInfo);
	}		}

	/**		/**
	@@ -179,6 +180,11 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal

	}		}

			@Override
			public MyPhotosStarter getMyPhotosStarter() {
			return mDelegate;
			}

	/**		/**
	* Represents a section of the Picker (eg "ThemeBundle", "Clock", etc).		* Represents a section of the Picker (eg "ThemeBundle", "Clock", etc).
	* There should be a concrete subclass per available section, providing the corresponding		* There should be a concrete subclass per available section, providing the corresponding