Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e2d91f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use shortcut long labels if available in Sharesheet" into rvc-dev am:... 

Merge "Use shortcut long labels if available in Sharesheet" into rvc-dev am: 059d812e am: 388393c8 am: bbcfaf8c am: d9b4ba1b

Change-Id: I64d391c34cfa20f9d6063da9b624d62b4f1b3599
parents b4650436 d9b4ba1b

core/java/com/android/internal/app/ChooserActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -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);