commit 5f3594fbf67ecfdeae0719063d9416c984498768
author Joe Onorato <joeo@android.com> Wed Nov 11 17:30:59 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 11 17:30:59 2009 -0800
tree 2bf323cd71170fbbdf077dd28672f8e3abfcdead
parent 2ae77c817de4cd5a8fd1b6c5cdc5821082540526
parent 5ce1ad8815aaaedcdd7d5dc0c137a08427881bb1

am 5ce1ad88: am 57bad466: am 028b624e: Fix 2226221 - home screen app names do not reflect on locale change

Merge commit '5ce1ad8815aaaedcdd7d5dc0c137a08427881bb1'

* commit '5ce1ad8815aaaedcdd7d5dc0c137a08427881bb1':
  Fix 2226221 - home screen app names do not reflect on locale change

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index d76e026..fc97832 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -680,7 +680,10 @@
                                 }
 
                                 if (info != null) {
-                                    info.title = c.getString(titleIndex);
+                                    if (itemType
+                                            != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {
+                                        info.title = c.getString(titleIndex);
+                                    }
                                     info.intent = intent;
 
                                     info.id = c.getLong(idIndex);