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

Commit 0a675ae8 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into... 

am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev

* commit '954f0d7b':
  Revert "Revert "Take the input device into account for meta state""
parents 8f61c7e8 954f0d7b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25082,7 +25082,9 @@ package android.text.method { 
    method public static void clearMetaKeyState(android.text.Editable, int);

    method public long clearMetaKeyState(long, int);

    method public static final int getMetaState(java.lang.CharSequence);

    method public static final int getMetaState(java.lang.CharSequence, android.view.KeyEvent);

    method public static final int getMetaState(java.lang.CharSequence, int);

    method public static final int getMetaState(java.lang.CharSequence, int, android.view.KeyEvent);

    method public static final int getMetaState(long);

    method public static final int getMetaState(long, int);

    method public static long handleKeyDown(long, int, android.view.KeyEvent);

core/java/android/text/method/ArrowKeyMovementMethod.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class ArrowKeyMovementMethod extends BaseMovementMethod implements Moveme 
                    if (event.getAction() == KeyEvent.ACTION_DOWN

                            && event.getRepeatCount() == 0

                            && MetaKeyKeyListener.getMetaState(buffer,

                                        MetaKeyKeyListener.META_SELECTING) != 0) {

                                        MetaKeyKeyListener.META_SELECTING, event) != 0) {

                        return widget.showContextMenu();

                    }

                }

core/java/android/text/method/BaseKeyListener.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener 
        }



        // Alt+Backspace or Alt+ForwardDelete deletes the current line, if possible.

        if (event.isAltPressed() || getMetaState(content, META_ALT_ON) == 1) {

        if (getMetaState(content, META_ALT_ON, event) == 1) {

            if (deleteLine(view, content)) {

                return true;

            }

core/java/android/text/method/BaseMovementMethod.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class BaseMovementMethod implements MovementMethod { 
     */

    protected int getMovementMetaState(Spannable buffer, KeyEvent event) {

        // We ignore locked modifiers and SHIFT.

        int metaState = (event.getMetaState() | MetaKeyKeyListener.getMetaState(buffer))

        int metaState = MetaKeyKeyListener.getMetaState(buffer, event)

                & ~(MetaKeyKeyListener.META_ALT_LOCKED | MetaKeyKeyListener.META_SYM_LOCKED);

        return KeyEvent.normalizeMetaState(metaState) & ~KeyEvent.META_SHIFT_MASK;

    }

core/java/android/text/method/DialerKeyListener.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class DialerKeyListener extends NumberKeyListener 
     * from the KeyEvent.

     */

    protected int lookup(KeyEvent event, Spannable content) {

        int meta = event.getMetaState() | getMetaState(content);

        int meta = getMetaState(content, event);

        int number = event.getNumber();



        /*