From 96bedec89c76809495d133f75d69af638ede6330 Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Fri, 2 Sep 2022 14:27:00 +0900
Subject: [PATCH] Assign redo action to Ctrl+Y shortcut

Bug: 244262525
Test: atest TextViewKeyboardShortcutTest
Change-Id: I43021b42f8f080990600e9fa84ae6dc40ebae148
---
 core/java/android/widget/TextView.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index f53dd0c53ef5e..415af42388cdc 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -11949,6 +11949,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                         return onTextContextMenuItem(ID_PASTE);
                     }
                     break;
+                case KeyEvent.KEYCODE_Y:
+                    if (canRedo()) {
+                        return onTextContextMenuItem(ID_REDO);
+                    }
+                    break;
             }
         } else if (event.hasModifiers(KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)) {
             // Handle Ctrl-Shift shortcuts.