diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-08-30 05:42:33 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 05:42:33 -0700 |
| commit | 59f9d3c8693c76236b73528b6eb950d6603df97d (patch) | |
| tree | 2547ed62540df2ea92f481c2fe833e37e72b4cc4 /java/res/layout | |
| parent | c9c383cf064c80eb2409ecdb36ecdd10aefdd53d (diff) | |
| parent | 5169937dd48d69e52e647662cb6fc3def5bf90d4 (diff) | |
| download | latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.tar.gz latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.tar.xz latinime-59f9d3c8693c76236b73528b6eb950d6603df97d.zip | |
am 5169937d: Revert "Revert "Support Emoji keyboard""
* commit '5169937dd48d69e52e647662cb6fc3def5bf90d4':
Revert "Revert "Support Emoji keyboard""
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/input_view.xml | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 1ffb8a32a..0b682d198 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -20,34 +20,41 @@ <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" > <!-- The height of key_preview_backing view will automatically be determined by code. --> <View android:id="@+id/key_preview_backing" android:layout_width="match_parent" android:layout_height="0dp" /> + <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 - android:id="@+id/suggestion_strip_view" - android:layoutDirection="ltr" - android:layout_width="match_parent" - android:layout_height="@dimen/suggestions_strip_height" - android:gravity="center_vertical" - 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.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:gravity="center_vertical" + 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_alignParentBottom="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <!-- 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="match_parent" + android:layout_height="wrap_content" /> + </LinearLayout> + <include + layout="@layout/emoji_keyboard_view" /> </com.android.inputmethod.latin.InputView> |