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

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

Support Emoji keyboard 

Bug: 6370846
Change-Id: I33ce8f952799c89929996a226ac17731a953ec2a
parent b384cb28

java/res/layout/input_view.xml

+25 −18
Original line number Diff line number Diff line
@@ -20,11 +20,17 @@ 


<com.android.inputmethod.latin.InputView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="bottom|center_horizontal"

>

    android:orientation="vertical" >

    <include

        layout="@layout/emoji_keyboard_view" />

    <LinearLayout

        android:id="@+id/main_keyboard_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical" >

        <!-- To ensure that key preview popup is correctly placed when the current system locale is

             one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->

        <com.android.inputmethod.latin.suggestions.SuggestionStripView
@@ -42,4 +48,5 @@ 
            android:layoutDirection="ltr"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

    </LinearLayout>

</com.android.inputmethod.latin.InputView>

java/res/values/emoji-categories.xml

+47 −0
Original line number Diff line number Diff line
@@ -36,26 +36,73 @@ 
        name="emoji_nature"

        format="string"

    >

        <item>2744</item> <!-- SNOWFLAKE -->

    </array>

    <array

        name="emoji_symbols"

        format="string"

    >

        <item>2460</item> <!-- CIRCLED DIGIT ONE -->

        <item>2461</item> <!-- CIRCLED DIGIT TWO -->

        <item>2462</item> <!-- CIRCLED DIGIT THREE -->

        <item>2463</item> <!-- CIRCLED DIGIT FOUR -->

        <item>2464</item> <!-- CIRCLED DIGIT FIVE -->

        <item>2465</item> <!-- CIRCLED DIGIT SIX -->

        <item>2466</item> <!-- CIRCLED DIGIT SEVEN -->

        <item>2467</item> <!-- CIRCLED DIGIT EIGHT -->

        <item>2468</item> <!-- CIRCLED DIGIT NINE -->

        <item>2469</item> <!-- CIRCLED DIGIT TEN -->

        <item>00ae</item> <!-- REGISTERED SIGN -->

        <item>00a9</item> <!-- COPYRIGHT SIGN -->

        <item>2122</item> <!-- TRADE MARK SIGN -->

        <item>2734</item> <!-- EIGHT POINTED BLACK STAR -->

        <item>2733</item> <!-- EIGHT POINTED PINWHEEL STAR -->

        <item>2716</item> <!-- HEAVY MULTIPLICATION MARK -->

        <item>2195</item> <!-- UP DOWN ARROW -->

        <item>2197</item> <!-- NORTH EAST ARROW -->

        <item>27a1</item> <!-- BLACK RIGHTWARDS ARROW -->

        <item>2198</item> <!-- SOUTH EAST ARROW -->

        <item>2199</item> <!-- SOUTH WEST ARROW -->

        <item>2196</item> <!-- NORTH EAST ARROW -->

        <item>2194</item> <!-- LEFT RIGHT ARROW -->

        <item>25c0</item> <!-- BLACK LEFT-POINTING TRIANGLE -->

        <item>25b6</item> <!-- BLACK ROGHT-POINTING TRIANGLE -->

        <item>2747</item> <!-- SPARKLE -->

        <item>25aa</item> <!-- BLACK SMALL SQUARE -->

        <item>203c</item> <!-- DOUBLE EXCLAMATION MARK -->

        <item>2660</item> <!-- BLACK SPADE SUIT -->

        <item>2665</item> <!-- BLACK HEART SUIT -->

        <item>2663</item> <!-- BLACK CLUB SUIT -->

        <item>2666</item> <!-- BLACK DIAMOND SUIT -->

        <item>21a9</item> <!-- LEFTWARDS ARROW WITH HOOK -->

        <item>21aa</item> <!-- RIGHTWARDS ARROW WITH HOOK -->

    </array>

    <array

        name="emoji_faces"

        format="string"

    >

        <item>270C</item> <!-- VICTORY HAND -->

        <item>2764</item> <!-- HEAVY BLACK HEART -->

    </array>

    <array

        name="emoji_objects"

        format="string"

    >

        <item>260e</item> <!-- BLACK TELEPHONE -->

        <item>2709</item> <!-- ENVELOPE -->

        <item>2712</item> <!-- BLACK NIB -->

        <item>270f</item> <!-- PENCIL -->

        <item>2702</item> <!-- BLACK SCISSORS -->

        <item>2669</item> <!-- QUARTER NOTE -->

        <item>266a</item> <!-- EIGHTH NOTE -->

        <item>266c</item> <!-- BEAMED SIXTEENTH NOTES -->

    </array>

    <array

        name="emoji_places"

        format="string"

    >

        <item>2708</item> <!-- AIRPLANE -->

        <item>2668</item> <!-- HOT SPRINGS -->

    </array>

    <array

        name="emoji_emoticons"

java/res/values/themes-common.xml

+8 −1
Original line number Diff line number Diff line
@@ -104,7 +104,14 @@ 
    <style

        name="MainKeyboardView"

        parent="KeyboardView" />

    <style name="EmojiKeyboardView" />

    <!-- Though {@link EmojiKeyboardView} doesn't extend {@link KeyboardView}, some views inside it,

         for instance delete button, need themed {@link KeyboardView} attributes. -->

    <style

        name="EmojiKeyboardView"

        parent="KeyboardView"

    >

        <item name="emojiTabLabelColor">@color/emoji_tab_label_color_ics</item>

    </style>

    <style name="MoreKeysKeyboard" />

    <style

        name="MoreKeysKeyboardView"

java/res/values/themes-gb.xml

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 
        <item name="spacebarTextColor">@color/spacebar_text_color_gb</item>

        <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_gb</item>

    </style>

    <!-- Though {@link EmojiKeyboardView} doesn't extend {@link KeyboardView}, some views inside it,

         for instance delete button, need themed {@link KeyboardView} attributes. -->

    <style

        name="EmojiKeyboardView.GB"

        parent="KeyboardView.GB"

java/res/values/themes-ics.xml

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ 
        <item name="spacebarTextColor">@color/spacebar_text_color_ics</item>

        <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_ics</item>

    </style>

    <!-- Though {@link EmojiKeyboardView} doesn't extend {@link KeyboardView}, some views inside it,

         for instance delete button, need themed {@link KeyboardView} attributes. -->

    <style

        name="EmojiKeyboardView.ICS"

        parent="KeyboardView.ICS"