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

Commit 3c8cd482 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Set qwerty mode if the keyboard is qwerty 

This CL also add Ctrl+Shift+V and Ctrl+Shift+Z shortcut description.

Bug: 240385199
Test: Manually done
Change-Id: Ieaf9e8b07744a7c71a678cdc0f20fa3152327226
parent 170bfef7

core/java/android/widget/Editor.java

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.content.UndoOperation; 
import android.content.UndoOwner;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Color;
@@ -101,6 +102,7 @@ import android.view.DragEvent; 
import android.view.Gravity;

import android.view.HapticFeedbackConstants;

import android.view.InputDevice;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuItem;
@@ -3124,6 +3126,9 @@ public class Editor { 
            }

        }



        final int keyboard = mTextView.getResources().getConfiguration().keyboard;

        menu.setQwertyMode(keyboard == Configuration.KEYBOARD_QWERTY);



        menu.add(Menu.NONE, TextView.ID_UNDO, MENU_ITEM_ORDER_UNDO,

                com.android.internal.R.string.undo)

                .setAlphabeticShortcut('z')
@@ -3131,6 +3136,7 @@ public class Editor { 
                .setEnabled(mTextView.canUndo());

        menu.add(Menu.NONE, TextView.ID_REDO, MENU_ITEM_ORDER_REDO,

                com.android.internal.R.string.redo)

                .setAlphabeticShortcut('z', KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)

                .setOnMenuItemClickListener(mOnContextMenuItemClickListener)

                .setEnabled(mTextView.canRedo());
@@ -3151,6 +3157,7 @@ public class Editor { 
                .setOnMenuItemClickListener(mOnContextMenuItemClickListener);

        menu.add(Menu.NONE, TextView.ID_PASTE_AS_PLAIN_TEXT, MENU_ITEM_ORDER_PASTE_AS_PLAIN_TEXT,

                com.android.internal.R.string.paste_as_plain_text)

                .setAlphabeticShortcut('v', KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)

                .setEnabled(mTextView.canPasteAsPlainText())

                .setOnMenuItemClickListener(mOnContextMenuItemClickListener);

        menu.add(Menu.NONE, TextView.ID_SHARE, MENU_ITEM_ORDER_SHARE,