Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f

Browse Source 
Change-Id: I57ed05e511cfc5717888fca64a66a75b4c114c83
This commit is contained in:
Mike Digman
2020-05-26 16:01:48 +00:00
committed by Automerger Merge Worker
parent 10e8e721ed 9a4ec16d7f
commit 8fa8ea8b55
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2147,8 +2147,7 @@ public class ChooserActivity extends ResolverActivity implements
extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId()); extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId());
ChooserTarget chooserTarget = new ChooserTarget( ChooserTarget chooserTarget = new ChooserTarget(
shortcutInfo.getLongLabel() != null ? shortcutInfo.getLongLabel() shortcutInfo.getLabel(),
: shortcutInfo.getShortLabel(),
null, // Icon will be loaded later if this target is selected to be shown. null, // Icon will be loaded later if this target is selected to be shown.
score, matchingShortcuts.get(i).getTargetComponent().clone(), extras); score, matchingShortcuts.get(i).getTargetComponent().clone(), extras);