From ed44706beb438147a0f7eb742d2ec8beb2d98665 Mon Sep 17 00:00:00 2001 From: Mike Digman Date: Wed, 20 May 2020 10:51:20 -0700 Subject: [PATCH] Use shortcut long labels if available in Sharesheet For disambiguation between targets, it's important to see the most detailed label provided by apps. This change is aligned with the logic being used to display conversation shortcuts. Fixes: 157142833 Test: manual Change-Id: I203afc794730cac5c92717035af0ea47d8e6496b --- core/java/com/android/internal/app/ChooserActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 9950e55f1415d..36274a2b33b68 100644 --- 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);