Merge "Use shortcut long labels if available in Sharesheet" into rvc-dev am: 059d812ef9 am: 388393c843

Change-Id: I42d1fe490f265dbda3e1ed636b5cb6e18a66c19b
2020-05-21 19:35:14 +00:00
parent abddcfaf4a 388393c843
commit bbcfaf8c86
1 changed files with 4 additions and 1 deletions
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2156,7 +2156,10 @@ public class ChooserActivity extends ResolverActivity implements

            Bundle extras = new Bundle();
            extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId());
-            ChooserTarget chooserTarget = new ChooserTarget(shortcutInfo.getShortLabel(),
+
+            ChooserTarget chooserTarget = new ChooserTarget(
+                    shortcutInfo.getLongLabel() != null ? shortcutInfo.getLongLabel()
+                            : shortcutInfo.getShortLabel(),
                    null, // Icon will be loaded later if this target is selected to be shown.
                    score, matchingShortcuts.get(i).getTargetComponent().clone(), extras);