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

Add shortcut title into pin label. Without shortcut title, the pin label does not make sense in non-English string. am: 82b7fd414d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18328646

Change-Id: Ief09433689d292791b7a3e8655289e937e674a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Hu
2022-05-12 02:32:17 +00:00
committed by Automerger Merge Worker
parent 7ce51c29f1 82b7fd414d
commit 0647b559de
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ChooserTargetActionsDialogFragment.java
View File

@@ -269,7 +269,7 @@ public class ChooserTargetActionsDialogFragment extends DialogFragment
protected CharSequence getItemLabel(DisplayResolveInfo dri) { protected CharSequence getItemLabel(DisplayResolveInfo dri) {
final PackageManager pm = getContext().getPackageManager(); final PackageManager pm = getContext().getPackageManager();
return getPinLabel(isPinned(dri), return getPinLabel(isPinned(dri),
isShortcutTarget() ? "" : dri.getResolveInfo().loadLabel(pm)); isShortcutTarget() ? mShortcutTitle : dri.getResolveInfo().loadLabel(pm));
} }
@Nullable @Nullable