LatinIME: Add clipboard paste key

pgaskin · pgaskin · commit e6a550f308f8 · 2026-03-22T21:59:45.000-04:00
In the additional comma keys (beside settings).

Change-Id: If715b33874cd2121a4d460748c1d8d053b49cc68
diff --git a/common/src/com/android/inputmethod/latin/common/Constants.java b/common/src/com/android/inputmethod/latin/common/Constants.java
@@ -247,6 +247,7 @@ public static boolean isValidCoordinate(final int coordinate) {
     public static final int CODE_ALPHA_FROM_EMOJI = -14;
     // Code value representing the code is not specified.
     public static final int CODE_UNSPECIFIED = -15;
+    public static final int CODE_CLIPBOARD_PASTE = -16;
 
     public static boolean isLetterCode(final int code) {
         return code >= CODE_SPACE;
@@ -269,6 +270,7 @@ public static String printableCode(final int code) {
         case CODE_SHIFT_ENTER: return "shiftEnter";
         case CODE_ALPHA_FROM_EMOJI: return "alpha";
         case CODE_UNSPECIFIED: return "unspec";
+        case CODE_CLIPBOARD_PASTE: return "clipboard_paste";
         case CODE_TAB: return "tab";
         case CODE_ENTER: return "enter";
         case CODE_SPACE: return "space";
diff --git a/java/res/drawable/sym_keyboard_clipboard_paste_lxx_dark.xml b/java/res/drawable/sym_keyboard_clipboard_paste_lxx_dark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: Material Design Authors / Google LLC
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#CCFFFFFF"
+        android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>
diff --git a/java/res/drawable/sym_keyboard_clipboard_paste_lxx_light.xml b/java/res/drawable/sym_keyboard_clipboard_paste_lxx_light.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: Material Design Authors / Google LLC
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#37474F"
+        android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>
diff --git a/java/res/drawable/sym_keyboard_clipboard_paste_you.xml b/java/res/drawable/sym_keyboard_clipboard_paste_you.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-FileCopyrightText: Material Design Authors / Google LLC
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_color_you"
+        android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
@@ -282,6 +282,7 @@
         <attr name="iconImeKey" format="reference" />
         <attr name="iconEmojiActionKey" format="reference" />
         <attr name="iconEmojiNormalKey" format="reference" />
+        <attr name="iconClipboardPasteKey" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="Keyboard_GridRows">
diff --git a/java/res/values/keyboard-icons-lxx-dark.xml b/java/res/values/keyboard-icons-lxx-dark.xml
@@ -42,5 +42,6 @@
         <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx_dark</item>
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
         <item name="iconEmojiNormalKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
+        <item name="iconClipboardPasteKey">@drawable/sym_keyboard_clipboard_paste_lxx_dark</item>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-lxx-light.xml b/java/res/values/keyboard-icons-lxx-light.xml
@@ -44,5 +44,6 @@
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
         <!-- Use dark green emoji icon (for lxx_light) because a normal key has white color background. -->
         <item name="iconEmojiNormalKey">@drawable/sym_keyboard_smiley_lxx_light</item>
+        <item name="iconClipboardPasteKey">@drawable/sym_keyboard_clipboard_paste_lxx_light</item>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-you.xml b/java/res/values/keyboard-icons-you.xml
@@ -27,5 +27,6 @@
         <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx_dark</item>
         <item name="iconEmojiActionKey">@drawable/sym_keyboard_smiley_you</item>
         <item name="iconEmojiNormalKey">@drawable/sym_keyboard_smiley_you</item>
+        <item name="iconClipboardPasteKey">@drawable/sym_keyboard_clipboard_paste_you</item>
     </style>
 </resources>
diff --git a/java/res/xml/key_styles_settings.xml b/java/res/xml/key_styles_settings.xml
@@ -35,7 +35,7 @@
             <key-style
                 latin:styleName="settingsMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint"
-                latin:additionalMoreKeys="!text/keyspec_settings"
+                latin:additionalMoreKeys="!text/keyspec_settings,!text/keyspec_clipboard_paste"
                 latin:backgroundType="functional" />
         </default>
     </switch>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
@@ -53,6 +53,7 @@ public static int getCode(final String name) {
         "key_emoji",
         "key_alpha_from_emoji",
         "key_unspecified",
+        "key_clipboard_paste",
     };
 
     private static final int[] DEFAULT = {
@@ -73,6 +74,7 @@ public static int getCode(final String name) {
         Constants.CODE_EMOJI,
         Constants.CODE_ALPHA_FROM_EMOJI,
         Constants.CODE_UNSPECIFIED,
+        Constants.CODE_CLIPBOARD_PASTE,
     };
 
     static {
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -58,6 +58,7 @@ public final class KeyboardIconsSet {
     public static final String NAME_ZWJ_KEY = "zwj_key";
     public static final String NAME_EMOJI_ACTION_KEY = "emoji_action_key";
     public static final String NAME_EMOJI_NORMAL_KEY = "emoji_normal_key";
+    public static final String NAME_CLIPBOARD_PASTE_KEY = "clipboard_paste_key";
 
     private static final SparseIntArray ATTR_ID_TO_ICON_ID = new SparseIntArray();
 
@@ -87,6 +88,7 @@ public final class KeyboardIconsSet {
         NAME_ZWJ_KEY,                     R.styleable.Keyboard_iconZwjKey,
         NAME_EMOJI_ACTION_KEY,            R.styleable.Keyboard_iconEmojiActionKey,
         NAME_EMOJI_NORMAL_KEY,            R.styleable.Keyboard_iconEmojiNormalKey,
+        NAME_CLIPBOARD_PASTE_KEY,         R.styleable.Keyboard_iconClipboardPasteKey,
     };
 
     private static int NUM_ICONS = NAMES_AND_ATTR_IDS.length / 2;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -242,35 +242,36 @@ public static String[] getTextsTable(final Locale locale) {
         /* 156: 0 */ "morekeys_symbols_0",
         /* 157: 0 */ "morekeys_am_pm",
         /* 158: 0 */ "keyspec_settings",
-        /* 159: 0 */ "keyspec_shortcut",
-        /* 160: 0 */ "keyspec_action_next",
-        /* 161: 0 */ "keyspec_action_previous",
-        /* 162: 0 */ "keylabel_to_more_symbol",
-        /* 163: 0 */ "keylabel_tablet_to_more_symbol",
-        /* 164: 0 */ "keylabel_to_phone_numeric",
-        /* 165: 0 */ "keylabel_to_phone_symbols",
-        /* 166: 0 */ "keylabel_time_am",
-        /* 167: 0 */ "keylabel_time_pm",
-        /* 168: 0 */ "keyspec_popular_domain",
-        /* 169: 0 */ "morekeys_popular_domain",
-        /* 170: 0 */ "keyspecs_left_parenthesis_more_keys",
-        /* 171: 0 */ "keyspecs_right_parenthesis_more_keys",
-        /* 172: 0 */ "single_laqm_raqm",
-        /* 173: 0 */ "single_raqm_laqm",
-        /* 174: 0 */ "double_laqm_raqm",
-        /* 175: 0 */ "double_raqm_laqm",
-        /* 176: 0 */ "single_lqm_rqm",
-        /* 177: 0 */ "single_9qm_lqm",
-        /* 178: 0 */ "single_9qm_rqm",
-        /* 179: 0 */ "single_rqm_9qm",
-        /* 180: 0 */ "double_lqm_rqm",
-        /* 181: 0 */ "double_9qm_lqm",
-        /* 182: 0 */ "double_9qm_rqm",
-        /* 183: 0 */ "double_rqm_9qm",
-        /* 184: 0 */ "morekeys_single_quote",
-        /* 185: 0 */ "morekeys_double_quote",
-        /* 186: 0 */ "morekeys_tablet_double_quote",
-        /* 187: 0 */ "keyspec_emoji_action_key",
+        /* 159: 0 */ "keyspec_clipboard_paste",
+        /* 160: 0 */ "keyspec_shortcut",
+        /* 161: 0 */ "keyspec_action_next",
+        /* 162: 0 */ "keyspec_action_previous",
+        /* 163: 0 */ "keylabel_to_more_symbol",
+        /* 164: 0 */ "keylabel_tablet_to_more_symbol",
+        /* 165: 0 */ "keylabel_to_phone_numeric",
+        /* 166: 0 */ "keylabel_to_phone_symbols",
+        /* 167: 0 */ "keylabel_time_am",
+        /* 168: 0 */ "keylabel_time_pm",
+        /* 169: 0 */ "keyspec_popular_domain",
+        /* 170: 0 */ "morekeys_popular_domain",
+        /* 171: 0 */ "keyspecs_left_parenthesis_more_keys",
+        /* 172: 0 */ "keyspecs_right_parenthesis_more_keys",
+        /* 173: 0 */ "single_laqm_raqm",
+        /* 174: 0 */ "single_raqm_laqm",
+        /* 175: 0 */ "double_laqm_raqm",
+        /* 176: 0 */ "double_raqm_laqm",
+        /* 177: 0 */ "single_lqm_rqm",
+        /* 178: 0 */ "single_9qm_lqm",
+        /* 179: 0 */ "single_9qm_rqm",
+        /* 180: 0 */ "single_rqm_9qm",
+        /* 181: 0 */ "double_lqm_rqm",
+        /* 182: 0 */ "double_9qm_lqm",
+        /* 183: 0 */ "double_9qm_rqm",
+        /* 184: 0 */ "double_rqm_9qm",
+        /* 185: 0 */ "morekeys_single_quote",
+        /* 186: 0 */ "morekeys_double_quote",
+        /* 187: 0 */ "morekeys_tablet_double_quote",
+        /* 188: 0 */ "keyspec_emoji_action_key",
     };
 
     private static final String EMPTY = "";
@@ -436,6 +437,7 @@ public static String[] getTextsTable(final Locale locale) {
         /* morekeys_symbols_0 */ "\u207F,\u2205",
         /* morekeys_am_pm */ "!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm",
         /* keyspec_settings */ "!icon/settings_key|!code/key_settings",
+        /* keyspec_clipboard_paste */ "!icon/clipboard_paste_key|!code/key_clipboard_paste",
         /* keyspec_shortcut */ "!icon/shortcut_key|!code/key_shortcut",
         /* keyspec_action_next */ "!hasLabels!,!text/label_next_key|!code/key_action_next",
         /* keyspec_action_previous */ "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
@@ -4214,7 +4216,7 @@ public static String[] getTextsTable(final Locale locale) {
 
     private static final Object[] LOCALES_AND_TEXTS = {
     // "locale", TEXT_ARRAY,  /* numberOfNonNullText/lengthOf_TEXT_ARRAY localeName */
-        "DEFAULT", TEXTS_DEFAULT, /* 188/188 DEFAULT */
+        "DEFAULT", TEXTS_DEFAULT, /* 189/189 DEFAULT */
         "af"     , TEXTS_af,    /*   7/ 13 Afrikaans */
         "ar"     , TEXTS_ar,    /*  55/110 Arabic */
         "az_AZ"  , TEXTS_az_AZ, /*  11/ 18 Azerbaijani (Azerbaijan) */
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -507,6 +507,13 @@ public void performEditorAction(final int actionId) {
         }
     }
 
+    public void performContextMenuAction(final int actionId) {
+        mIC = mParent.getCurrentInputConnection();
+        if (isConnected()) {
+            mIC.performContextMenuAction(actionId);
+        }
+    }
+
     public void sendKeyEvent(final KeyEvent keyEvent) {
         if (DEBUG_BATCH_NESTING) checkBatchEdit();
         if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -683,6 +683,9 @@ private void handleFunctionalEvent(final Event event, final InputTransaction inp
             case Constants.CODE_SETTINGS:
                 onSettingsKeyPressed();
                 break;
+            case Constants.CODE_CLIPBOARD_PASTE:
+                mConnection.performContextMenuAction(android.R.id.paste);
+                break;
             case Constants.CODE_SHORTCUT:
                 // We need to switch to the shortcut IME. This is handled by LatinIME since the
                 // input logic has no business with IME switching.
diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
@@ -214,6 +214,7 @@
     <string name="morekeys_symbols_percent">&#x2030;</string>
     <string name="morekeys_am_pm">!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm</string>
     <string name="keyspec_settings">!icon/settings_key|!code/key_settings</string>
+    <string name="keyspec_clipboard_paste">!icon/clipboard_paste_key|!code/key_clipboard_paste</string>
     <string name="keyspec_shortcut">!icon/shortcut_key|!code/key_shortcut</string>
     <string name="keyspec_action_next">!hasLabels!,!text/label_next_key|!code/key_action_next</string>
     <string name="keyspec_action_previous">!hasLabels!,!text/label_previous_key|!code/key_action_previous</string>
