Merge tag 'android-14.0.0_r50' into leaf-3.2
Android 14.0.0 Release 50 (AP2A.240605.024)
* tag 'android-14.0.0_r50': (123 commits)
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Multicrop: adds crop hints to recents
Multi-crop: refactors adding recents for better code reuse
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Fix static wallpaper crash
Fix editing current wallpaper crop on foldable
Fix preview crash on unfold in multi-crop
Use default crop if no crop when set wallpaper
Fix setting Emoji wallpaper issue
Revert^2 "Use Wallpaper Manager to preview crop color"
Ignore WallpaperPreviewActivityTest due to permission failures
Add SetFlagRule to WallpaperPreviewActivityTest (1/3)
Fix preview screen issue on foldables when unfolding
Align preview based on layout direction
Fix Emoji wallpaper crash when clicking on preview
Use the current display size for CreativeNewPreviewFragment
Remove unnecessary vertical parallax
Add parallax to cropHints for multi-crop
...
Change-Id: Iad7f64ff88e5f8e0cedd9df36e0bf85d8d2fe90b
diff --git a/src/com/android/wallpaper/module/DefaultCategoryProvider.java b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
index 4c7c8dd..179fc32 100755
--- a/src/com/android/wallpaper/module/DefaultCategoryProvider.java
+++ b/src/com/android/wallpaper/module/DefaultCategoryProvider.java
@@ -336,7 +336,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) {
@@ -354,11 +353,6 @@
}
if (wallpaper != null) {
categoryBuilder.addWallpaper(wallpaper);
- // Publish progress only if there's at least one wallpaper
- if (!publishedPlaceholder) {
- publishProgress(categoryBuilder.buildPlaceholder());
- publishedPlaceholder = true;
- }
}
}
}