Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32': (59 commits)
Offset preview to start if on wallpaper display
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
[WPP2] Make injectors kt
Fix wallpaper preview misaligned on small screen.
Renames customization content provider (4/7).
Unified screen preview section (1/3).
Moves common screen preview logic to WPP2 (1/2).
Wallpaper picker reset support (1/3).
Add logEffectProbe in UserEventLogger
Add target for ThemePicker instrumented tests
Tabbed navigation in Wallpaper Picker (1/3).
[WPP2] Use system flag for fullscreen wallpaper preview
Defines flag for ravemped WPP UI (3/5).
[WPP2] Fix live wallpaper preview stretched
Import translations. DO NOT MERGE ANYWHERE
[WPP2] Fix fullscreen preview toolbar text color
[WPP2] Avoid to create view in constructor of floating sheet content
[WPP2] Fix colors
Lock screen preview in quick affordance picker.
...
Change-Id: I5ff86d26876b2948e075046f4d128593242b22fc
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;
- }
}
}
}