diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-06 20:35:15 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-06 20:35:15 -0700 |
| commit | 6f726f6fffb7cbd305a2707fab50f67afb183420 (patch) | |
| tree | 9ab5c197339777c0dfeb1698fb3d9ab269f3c0a0 /java/res/layout | |
| parent | 7b8c9dd0b0249af40ab28efb129b90a7dacde7ea (diff) | |
| parent | d76b55297940a65bb9479020a9ed58aa978a0aea (diff) | |
| download | latinime-6f726f6fffb7cbd305a2707fab50f67afb183420.tar.gz latinime-6f726f6fffb7cbd305a2707fab50f67afb183420.tar.xz latinime-6f726f6fffb7cbd305a2707fab50f67afb183420.zip | |
am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
* commit 'd76b55297940a65bb9479020a9ed58aa978a0aea':
Rename EmojiKeyboardView -> EmojiPalettesView
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/emoji_palettes_view.xml (renamed from java/res/layout/emoji_keyboard_view.xml) | 6 | ||||
| -rw-r--r-- | java/res/layout/input_view.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/res/layout/emoji_keyboard_view.xml b/java/res/layout/emoji_palettes_view.xml index 4566a5a1f..613332675 100644 --- a/java/res/layout/emoji_keyboard_view.xml +++ b/java/res/layout/emoji_palettes_view.xml @@ -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> diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 0b682d198..1e7a3844e 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -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> |