diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-29 04:31:47 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-29 04:31:47 -0700 |
| commit | 243c23dd9f1c34e39fd257ffb99f7449c007c424 (patch) | |
| tree | d550c50d183117d6f1d57318a0c79d0a3f307383 /java/res/layout | |
| parent | 7c1a6f9787b4615f70656ddd6604d720be5b9d3e (diff) | |
| parent | d7791a93b0dee268a9e97f06fe5abcf6082e0ed1 (diff) | |
| download | latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.tar.gz latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.tar.xz latinime-243c23dd9f1c34e39fd257ffb99f7449c007c424.zip | |
am d7791a93: Support Emoji keyboard
* commit 'd7791a93b0dee268a9e97f06fe5abcf6082e0ed1':
Support Emoji keyboard
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/input_view.xml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 78217b01a..86bd1e6c7 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -20,26 +20,33 @@ <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" -> - <!-- 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 - android:id="@+id/suggestion_strip_view" - android:layoutDirection="ltr" - android:layout_width="match_parent" - android:layout_height="@dimen/suggestions_strip_height" - android:paddingRight="@dimen/suggestions_strip_padding" - android:paddingLeft="@dimen/suggestions_strip_padding" - style="?attr/suggestionStripViewStyle" /> - <!-- 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.keyboard.MainKeyboardView - android:id="@+id/keyboard_view" - android:layoutDirection="ltr" + 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: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 + android:id="@+id/suggestion_strip_view" + android:layoutDirection="ltr" + android:layout_width="match_parent" + android:layout_height="@dimen/suggestions_strip_height" + android:paddingRight="@dimen/suggestions_strip_padding" + android:paddingLeft="@dimen/suggestions_strip_padding" + style="?attr/suggestionStripViewStyle" /> + <!-- 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.keyboard.MainKeyboardView + android:id="@+id/keyboard_view" + android:layoutDirection="ltr" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout> </com.android.inputmethod.latin.InputView> |