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

Commit 8767b883 authored by Oli Lan's avatar Oli Lan Committed by Android (Google) Code Review
Browse files

Merge "Use string resources for clipboard access notifications." into sc-dev

parents 804d93c2 601b95c3

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2778,6 +2778,12 @@ 
    <!-- Displayed to the user to confirm that they have copied text/images to the clipboard [CHAR LIMIT=NONE] -->

    <string name="copied">Copied</string>



    <!-- Displayed to the user to inform them that an app has accessed clipboard data (pasted as in "copy and paste") that was copied from another app [CHAR LIMIT=50] -->

    <string name="pasted_from_app"><xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g> pasted from <xliff:g id="source_app_name" example="Chrome">%2$s</xliff:g></string>



    <!-- Displayed to the user to inform them that an app has accessed clipboard data (pasted as in "copy and paste") [CHAR LIMIT=50] -->

    <string name="pasted_from_clipboard"><xliff:g id="pasting_app_name" example="Gmail">%1$s</xliff:g> pasted from clipboard</string>



    <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->

    <string name="more_item_label">More</string>

    <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ 
  <java-symbol type="string" name="prepend_shortcut_label" />

  <java-symbol type="string" name="private_dns_broken_detailed" />

  <java-symbol type="string" name="paste_as_plain_text" />

  <java-symbol type="string" name="pasted_from_app" />

  <java-symbol type="string" name="pasted_from_clipboard" />

  <java-symbol type="string" name="replace" />

  <java-symbol type="string" name="undo" />

  <java-symbol type="string" name="redo" />

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

+4 −2
Original line number Diff line number Diff line
@@ -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(() ->