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

Commit 68b990e7 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add emoji keyboard element ids 

Bug: 6370846
Change-Id: I0ac55bc06e1527bafad395f4a2b5059e1fed4b5d
parent 73c29481

java/res/values/attrs.xml

+14 −0
Original line number Diff line number Diff line
@@ -373,6 +373,13 @@ 
            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />

            <enum name="emojiRecents" value="10" />

            <enum name="emojiCategory1" value="11" />

            <enum name="emojiCategory2" value="12" />

            <enum name="emojiCategory3" value="13" />

            <enum name="emojiCategory4" value="14" />

            <enum name="emojiCategory5" value="15" />

            <enum name="emojiCategory6" value="16" />

        </attr>

        <!-- This should be aligned with KeyboardId.MODE_* -->

        <attr name="mode" format="enum|string">
@@ -427,6 +434,13 @@ 
            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />

            <enum name="emojiRecents" value="10" />

            <enum name="emojiCategory1" value="11" />

            <enum name="emojiCategory2" value="12" />

            <enum name="emojiCategory3" value="13" />

            <enum name="emojiCategory4" value="14" />

            <enum name="emojiCategory5" value="15" />

            <enum name="emojiCategory6" value="16" />

        </attr>

        <attr name="elementKeyboard" format="reference"/>

        <!-- Enable proximity characters correction. Disabled by default. -->

java/src/com/android/inputmethod/keyboard/KeyboardId.java

+14 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ public final class KeyboardId { 
    public static final int ELEMENT_PHONE = 7;

    public static final int ELEMENT_PHONE_SYMBOLS = 8;

    public static final int ELEMENT_NUMBER = 9;

    public static final int ELEMENT_EMOJI_RECENTS = 10;

    public static final int ELEMENT_EMOJI_CATEGORY1 = 11;

    public static final int ELEMENT_EMOJI_CATEGORY2 = 12;

    public static final int ELEMENT_EMOJI_CATEGORY3 = 13;

    public static final int ELEMENT_EMOJI_CATEGORY4 = 14;

    public static final int ELEMENT_EMOJI_CATEGORY5 = 15;

    public static final int ELEMENT_EMOJI_CATEGORY6 = 16;



    public final InputMethodSubtype mSubtype;

    public final Locale mLocale;
@@ -215,6 +222,13 @@ public final class KeyboardId { 
        case ELEMENT_PHONE: return "phone";

        case ELEMENT_PHONE_SYMBOLS: return "phoneSymbols";

        case ELEMENT_NUMBER: return "number";

        case ELEMENT_EMOJI_RECENTS: return "emojiRecents";

        case ELEMENT_EMOJI_CATEGORY1: return "emojiCategory1";

        case ELEMENT_EMOJI_CATEGORY2: return "emojiCategory2";

        case ELEMENT_EMOJI_CATEGORY3: return "emojiCategory3";

        case ELEMENT_EMOJI_CATEGORY4: return "emojiCategory4";

        case ELEMENT_EMOJI_CATEGORY5: return "emojiCategory5";

        case ELEMENT_EMOJI_CATEGORY6: return "emojiCategory6";

        default: return null;

        }

    }