Merge "Fixing icon label not updated during bulk load" into tm-qpr-dev am: 9fb9ae1a9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19387603

Change-Id: I90d5717d6d3c5879b6f7186effa4b503e9f4426b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-25 19:57:20 +00:00
committed by Automerger Merge Worker
@@ -291,12 +291,16 @@ public class LoaderCursor extends CursorWrapper {
// from the db
if (TextUtils.isEmpty(info.title)) {
info.title = getTitle();
}
if (loadIcon) {
info.title = getTitle();
// fall back to the class name of the activity
if (info.title == null) {
info.title = componentName.getClassName();
// fall back to the class name of the activity
if (info.title == null) {
info.title = componentName.getClassName();
}
} else {
info.title = "";
}
}
info.contentDescription = mPM.getUserBadgedLabel(info.title, info.user);