commit 9fb9ae1a9e6ea1ddc6e2d600c1ef89be3e64b650
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 25 19:17:51 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 25 19:17:51 2022 +0000
tree 5d0ccfbc05dfcc4ffd955f07a90e8c4ccf83e560
parent d59a6e053de663f75102ec17cc212aec2bc99e4d
parent 412f0d26fa15b1d5f14f13ff81937b4eb2f05f80

Merge "Fixing icon label not updated during bulk load" into tm-qpr-dev

src/com/android/launcher3/model/LoaderCursor.java

diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index ae5b66a..87e8ebf 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -291,12 +291,16 @@
 
         // 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);