Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52': (108 commits)
Revert "Calculate LiveWallpaper thumbnail raw dimension"
Revert "Calculate LiveWallpaper thumbnail raw dimension"
Fixes wallpaper crash when loading live thumbnail
Reload wallpapers if changed onResume
Calculate LiveWallpaper thumbnail raw dimension
Fixes wallpaper thumbnails disappearing after setting wallpaper
Import translations. DO NOT MERGE ANYWHERE
Shows blurred thumbnail before fading to live preview
Fades in preview of feathers to avoid flicker
Updates wallpaper preview when choosing new wallpaper
Import translations. DO NOT MERGE ANYWHERE
Use the same cropping for outer screen and unfolded vertical hinge
[WPP2] Hide preview bottom components when overlay tabs are shown
Add progress button in preview
Enabling refresh of the collection view for emoji wallpapers
[WPP2] Improve full preview
[WPP2] Animate hide wallpaper preview controller
Disconnects preview engines when closing Hub picker
Added a new feature flag for AI Wallpaper in WallpaperPicker
Import translations. DO NOT MERGE ANYWHERE
...
Change-Id: Ia4c2452f31d8fe23575ecea7d73ec37aef1e765b
diff --git a/src/com/android/wallpaper/model/PartnerWallpaperInfo.java b/src/com/android/wallpaper/model/PartnerWallpaperInfo.java
index 2f71ca4..285a84b 100755
--- a/src/com/android/wallpaper/model/PartnerWallpaperInfo.java
+++ b/src/com/android/wallpaper/model/PartnerWallpaperInfo.java
@@ -133,11 +133,8 @@
@Override
public Asset getThumbAsset(Context context) {
- if (mThumbAsset == null) {
- Resources partnerRes = getPartnerResources(context);
- mThumbAsset = new ResourceAsset(partnerRes, mThumbRes);
- }
- return mThumbAsset;
+ // Same asset as full size.
+ return getAsset(context);
}
@Override
diff --git a/src/com/android/wallpaper/module/DefaultCategoryProvider.java b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
index 6ba9f6a..e2f0530 100755
--- a/src/com/android/wallpaper/module/DefaultCategoryProvider.java
+++ b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
@@ -302,7 +302,6 @@
Xml.asAttributeSet(parser));
categoryBuilder.setPriorityIfEmpty(PRIORITY_SYSTEM + priorityTracker++);
final int categoryDepth = parser.getDepth();
- boolean publishedPlaceholder = false;
while (((type = parser.next()) != XmlPullParser.END_TAG
|| parser.getDepth() > categoryDepth)
&& type != XmlPullParser.END_DOCUMENT) {
@@ -320,11 +319,6 @@
}
if (wallpaper != null) {
categoryBuilder.addWallpaper(wallpaper);
- // Publish progress only if there's at least one wallpaper
- if (!publishedPlaceholder) {
- publishProgress(categoryBuilder.buildPlaceholder());
- publishedPlaceholder = true;
- }
}
}
}