From d76b55297940a65bb9479020a9ed58aa978a0aea Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Mon, 7 Oct 2013 11:28:57 +0900 Subject: Rename EmojiKeyboardView -> EmojiPalettesView Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2 --- java/res/layout/emoji_keyboard_view.xml | 110 --- java/res/layout/emoji_palettes_view.xml | 110 +++ java/res/layout/input_view.xml | 2 +- java/res/values/attrs.xml | 6 +- java/res/values/themes-common.xml | 4 +- java/res/values/themes-gb.xml | 6 +- java/res/values/themes-ics.xml | 6 +- .../inputmethod/keyboard/EmojiKeyboardView.java | 788 -------------------- .../inputmethod/keyboard/EmojiPalettesView.java | 794 +++++++++++++++++++++ .../inputmethod/keyboard/KeyboardSwitcher.java | 18 +- .../keyboard/internal/DynamicGridKeyboard.java | 4 +- 11 files changed, 927 insertions(+), 921 deletions(-) delete mode 100644 java/res/layout/emoji_keyboard_view.xml create mode 100644 java/res/layout/emoji_palettes_view.xml delete mode 100644 java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java create mode 100644 java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java (limited to 'java') diff --git a/java/res/layout/emoji_keyboard_view.xml b/java/res/layout/emoji_keyboard_view.xml deleted file mode 100644 index 4566a5a1f..000000000 --- a/java/res/layout/emoji_keyboard_view.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml new file mode 100644 index 000000000..613332675 --- /dev/null +++ b/java/res/layout/emoji_palettes_view.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + 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" /> + layout="@layout/emoji_palettes_view" /> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 09782143f..31945d020 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -26,8 +26,8 @@ - - + + @@ -167,7 +167,7 @@ - + diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml index 8e9cfc90b..37607711d 100644 --- a/java/res/values/themes-common.xml +++ b/java/res/values/themes-common.xml @@ -104,10 +104,10 @@ - -