Trebuchet: Fix Settings shortcut widget title displays wrong when changing system language

1.Add a Settings shortcut widget to workspace
2.Change the system language
3.Check the Settings shortcut widget title

The Settings shortcut widget title should update when changing the language

Change-Id: I5012a3e99b9734230a844ce20e856ff86fba773a
(cherry picked from commit c4326d489d5e8e252417a5edadc9e413c355d471)

1 files changed, 19 insertions, 0 deletions

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4da49ce34..e0ad4615f 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -30,6 +30,7 @@ import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
@@ -2181,6 +2182,11 @@ public class LauncherModel extends BroadcastReceiver
                                             iconPackageIndex, iconResourceIndex, iconIndex,
                                             titleIndex);
 
+                                    CharSequence title = getShortcutTitle(manager, intent);
+                                    if (title != null) {
+                                        info.title = title;
+                                    }
+
                                     // App shortcuts that used to be automatically added to Launcher
                                     // didn't always have the correct intent flags set, so do that
                                     // here
@@ -3963,4 +3969,17 @@ public class LauncherModel extends BroadcastReceiver
             Log.d(TAG, "mLoaderTask=null");
         }
     }
+
+    private CharSequence getShortcutTitle(PackageManager manager, Intent intent) {
+        ComponentName componentName = intent.getComponent();
+        if (componentName == null) {
+            return null;
+        }
+        ResolveInfo resolveInfo = manager.resolveActivity(intent, 0);
+        if (resolveInfo != null) {
+            return resolveInfo.activityInfo.loadLabel(manager);
+        }
+        return null;
+    }
+
 }