From 5144448633a788fd48ac2f3b53f5dd97ab80bb7c Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Wed, 8 Feb 2023 13:27:50 +0900
Subject: [PATCH] Make icon visible on context menu

Bug: 240385199
Test: manually verified
Change-Id: I530d0e3cc6ab4d49c215f6d603dbab978a09ec3d
---
 core/java/android/view/Menu.java                         | 9 +++++++++
 core/java/android/widget/Editor.java                     | 2 ++
 .../java/com/android/internal/view/menu/MenuBuilder.java | 7 ++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/Menu.java b/core/java/android/view/Menu.java
index 6d1f740ad1daf..3ad40b551ee34 100644
--- a/core/java/android/view/Menu.java
+++ b/core/java/android/view/Menu.java
@@ -355,6 +355,15 @@ public interface Menu {
      * @see MenuItem#setVisible
      */
     public void setGroupVisible(int group, boolean visible);
+
+    /**
+     * Sets the optional icon visible.
+     * @param visible true for visible, false for hidden.
+     *
+     * @hide
+     */
+    default void setOptionalIconsVisible(boolean visible) {
+    }
     
     /**
      * Enable or disable all menu items that are in the given group.
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 136846a7bf61a..71425972d7496 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3144,6 +3144,8 @@ public class Editor {
             }
         }
 
+        menu.setOptionalIconsVisible(true);
+
         final int keyboard = mTextView.getResources().getConfiguration().keyboard;
         menu.setQwertyMode(keyboard == Configuration.KEYBOARD_QWERTY);
 
diff --git a/core/java/com/android/internal/view/menu/MenuBuilder.java b/core/java/com/android/internal/view/menu/MenuBuilder.java
index 0b490b20df0e2..0fd8f03b1d360 100644
--- a/core/java/com/android/internal/view/menu/MenuBuilder.java
+++ b/core/java/com/android/internal/view/menu/MenuBuilder.java
@@ -1286,8 +1286,13 @@ public class MenuBuilder implements Menu {
         mCurrentMenuInfo = menuInfo;
     }
 
+    /**
+     * Sets the optional icon visible.
+     * @param visible true for visible, false for hidden.
+     */
     @UnsupportedAppUsage
-    void setOptionalIconsVisible(boolean visible) {
+    @Override
+    public void setOptionalIconsVisible(boolean visible) {
         mOptionalIconsVisible = visible;
     }