From eb257d1a7d72e71f39532b53f257ff7569d4aa29 Mon Sep 17 00:00:00 2001 From: Mike Digman Date: Thu, 21 May 2020 16:04:43 -0700 Subject: [PATCH] Use current label for Sharing Shortcuts in Sharesheet A recent ShortcutInfo change bakes in support for using any set long label and defaulting to the short label if unavailable. Instead of duplicating logic, reuse this new method. Fixes: 157142833 Test: manual Change-Id: Ic8104ac57dd91a79b93739514655d7dbb5ad36e2 --- core/java/com/android/internal/app/ChooserActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 389e33ae7ae25..f041ad91b559d 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -2147,8 +2147,7 @@ public class ChooserActivity extends ResolverActivity implements extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId()); ChooserTarget chooserTarget = new ChooserTarget( - shortcutInfo.getLongLabel() != null ? shortcutInfo.getLongLabel() - : shortcutInfo.getShortLabel(), + shortcutInfo.getLabel(), null, // Icon will be loaded later if this target is selected to be shown. score, matchingShortcuts.get(i).getTargetComponent().clone(), extras);