Merge "Passed an extra flag denoting whether assetId is present or not" into udc-qpr-dev
diff --git a/src/com/android/customization/model/theme/ThemeBundledWallpaperInfo.java b/src/com/android/customization/model/theme/ThemeBundledWallpaperInfo.java
index d3935e8..4f0cd6c 100644
--- a/src/com/android/customization/model/theme/ThemeBundledWallpaperInfo.java
+++ b/src/com/android/customization/model/theme/ThemeBundledWallpaperInfo.java
@@ -137,13 +137,13 @@
@Override
public void showPreview(Activity srcActivity, InlinePreviewIntentFactory factory,
- int requestCode) {
+ int requestCode, boolean isAssetIdPresent) {
try {
- srcActivity.startActivityForResult(factory.newIntent(srcActivity, this), requestCode);
+ srcActivity.startActivityForResult(factory.newIntent(srcActivity, this,
+ isAssetIdPresent), requestCode);
} catch (ActivityNotFoundException |SecurityException e) {
Log.e(TAG, "App isn't installed or ThemePicker doesn't have permission to launch", e);
}
-
}
@Override
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 80960aa..03f6176 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -181,7 +181,8 @@
mode: Int,
viewAsHome: Boolean,
viewFullScreen: Boolean,
- testingModeEnabled: Boolean
+ testingModeEnabled: Boolean,
+ isAssetIdPresent: Boolean
): Fragment {
return if (wallpaperInfo is LiveWallpaperInfo) LivePreviewFragment()
else