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

Commit b509065a authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 2438785: Add missing key code to landscape keyboard and fix log spew."

parents 6a353876 ec52eedc

core/java/com/android/internal/widget/PasswordEntryKeyboard.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class PasswordEntryKeyboard extends Keyboard { 
        LatinKey key = new LatinKey(res, parent, x, y, parser);

        final int code = key.codes[0];

        if (code >=0 && code != '\n' && (code < 32 || code > 127)) {

            Log.w(TAG, "Key code for " + key.label + " is not latin-1");

            // Log.w(TAG, "Key code for " + key.label + " is not latin-1");

            key.label = " ";

            key.setEnabled(false);

        }

core/res/res/xml-land/password_kbd_qwerty.xml

+3 −4
Original line number Diff line number Diff line
@@ -77,10 +77,9 @@ 
            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="20%p"/>

        <Key android:keyLabel="=" />

        <Key android:keyLabel="."

            android:keyWidth="10%p"/>

        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

        <Key android:keyLabel="." android:keyWidth="10%p"/>

        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_ok"

            android:iconPreview="@drawable/sym_keyboard_feedback_ok"

            android:keyWidth="20%p" android:keyEdgeFlags="right"/>

    </Row>

core/res/res/xml-land/password_kbd_qwerty_shifted.xml

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ 
            android:keyWidth="20%p"/>

        <Key android:keyLabel="+" />

        <Key android:keyLabel="."/>

        <Key android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_ok"

            android:iconPreview="@drawable/sym_keyboard_feedback_ok"

            android:keyWidth="20%p" android:keyEdgeFlags="right"/>

    </Row>