diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2b1168f14f210..2ffa29b533310 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2778,6 +2778,12 @@ Copied + + %1$s pasted from %2$s + + + %1$s pasted from clipboard + More diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 00cc81639608c..07938fd3a3248 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -558,6 +558,8 @@ + + diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index 7dfecd56eaf50..5020917f8eb18 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -60,6 +60,7 @@ import android.util.SparseArray; import android.view.autofill.AutofillManagerInternal; import android.widget.Toast; +import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.server.LocalServices; import com.android.server.SystemService; @@ -955,9 +956,10 @@ public class ClipboardService extends SystemService { mPm.getApplicationInfoAsUser(callingPackage, 0, userId)); String message; if (sourceAppLabel != null) { - message = callingAppLabel + " pasted from " + sourceAppLabel; + message = getContext().getString( + R.string.pasted_from_app, callingAppLabel, sourceAppLabel); } else { - message = callingAppLabel + " pasted from clipboard"; + message = getContext().getString(R.string.pasted_from_clipboard, callingAppLabel); } Slog.i(TAG, message); Binder.withCleanCallingIdentity(() ->