Commit 4cdd6e54 authored May 12, 2022 by Song Hu Committed by Automerger Merge Worker May 12, 2022

Add shortcut title into pin label. Without shortcut title, the pin label does...

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

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

Change-Id: I98f1d2efda6bec922e265385e3da2113544bc39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+1 −1

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

		@Nullable