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
This commit is contained in:
Mike Digman
2020-05-21 16:04:43 -07:00
parent 3f24b9cf64
commit eb257d1a7d

View File

@@ -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);