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

Commit 909d9927 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Change clipboard access notification wording." into sc-dev am: ad73e492 

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

Change-Id: Ic416c1c5b2871079dfdc8bc634f80dce9a0d1e46
parents bde3aaa6 ad73e492

services/core/java/com/android/server/clipboard/ClipboardService.java

+2 −8
Original line number Diff line number Diff line
@@ -952,14 +952,8 @@ public class ClipboardService extends SystemService { 
            try {

                CharSequence callingAppLabel = mPm.getApplicationLabel(

                        mPm.getApplicationInfoAsUser(callingPackage, 0, userId));

                String message;

                if (isText(clipboard.primaryClip)) {

                    message = getContext().getString(

                            R.string.pasted_text, callingAppLabel);

                } else {

                    message = getContext().getString(

                            R.string.pasted_content, callingAppLabel);

                }

                String message =

                        getContext().getString(R.string.pasted_from_clipboard, callingAppLabel);

                Slog.i(TAG, message);

                Toast.makeText(

                        getContext(), UiThread.get().getLooper(), message, Toast.LENGTH_SHORT)