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

Commit 6f726f6f authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView 

* commit 'd76b5529':
  Rename EmojiKeyboardView -> EmojiPalettesView
parents 7b8c9dd0 d76b5529

java/res/layout/emoji_keyboard_view.xml→java/res/layout/emoji_palettes_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
*/

-->



<com.android.inputmethod.keyboard.EmojiKeyboardView

<com.android.inputmethod.keyboard.EmojiPalettesView

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

    android:id="@+id/emoji_keyboard_view"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    style="?attr/emojiKeyboardViewStyle"

    style="?attr/emojiPalettesViewStyle"

>

    <LinearLayout

        android:orientation="horizontal"
@@ -107,4 +107,4 @@ 
            android:layout_height="match_parent"

            android:src="@drawable/sym_keyboard_return_holo_dark" />

    </LinearLayout>

</com.android.inputmethod.keyboard.EmojiKeyboardView>
 
</com.android.inputmethod.keyboard.EmojiPalettesView>

java/res/layout/input_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,5 +56,5 @@ 
            android:layout_height="wrap_content" />

    </LinearLayout>

    <include

        layout="@layout/emoji_keyboard_view" />

        layout="@layout/emoji_palettes_view" />

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

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
        <attr name="keyboardViewStyle" format="reference" />

        <!-- MainKeyboardView style -->

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

        <!-- EmojiKeyboardView style -->

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

        <!-- EmojiPalettesView style -->

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

        <!-- MoreKeysKeyboard style -->

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

        <!-- MoreKeysKeyboardView style -->
@@ -167,7 +167,7 @@ 
        <attr name="suppressKeyPreviewAfterBatchInputDuration" format="integer" />

    </declare-styleable>



    <declare-styleable name="EmojiKeyboardView">

    <declare-styleable name="EmojiPalettesView">

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

    </declare-styleable>

java/res/values/themes-common.xml

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ 
    <style

        name="MainKeyboardView"

        parent="KeyboardView" />

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

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

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

    <style

        name="EmojiKeyboardView"

        name="EmojiPalettesView"

        parent="KeyboardView"

    >

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

java/res/values/themes-gb.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <item name="keyboardStyle">@style/Keyboard.GB</item>

        <item name="keyboardViewStyle">@style/KeyboardView.GB</item>

        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.GB</item>

        <item name="emojiKeyboardViewStyle">@style/EmojiKeyboardView.GB</item>

        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.GB</item>

        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.GB</item>

        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.GB</item>

        <item name="moreKeysKeyboardContainerStyle">@style/MoreKeysKeyboardContainer.GB</item>
@@ -96,10 +96,10 @@ 
        <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,

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

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

    <style

        name="EmojiKeyboardView.GB"

        name="EmojiPalettesView.GB"

        parent="KeyboardView.GB"

    >

        <item name="keyBackground">@drawable/btn_keyboard_key_functional_gb</item>