diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-08-30 00:29:24 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 00:29:24 -0700 |
| commit | eca8832b92b09fd97c04dbb1262a8152b9dafaa2 (patch) | |
| tree | 2dc3b2903748281fea9f494d67c02dca600c831b /java/res/layout | |
| parent | 2934b83e2e34fd4f75a0add61279372ee7d633f5 (diff) | |
| parent | 4445671efc673165979195c13f197128c14fbe7c (diff) | |
| download | latinime-eca8832b92b09fd97c04dbb1262a8152b9dafaa2.tar.gz latinime-eca8832b92b09fd97c04dbb1262a8152b9dafaa2.tar.xz latinime-eca8832b92b09fd97c04dbb1262a8152b9dafaa2.zip | |
am 4445671e: Merge "Revert "Support Emoji keyboard""
* commit '4445671efc673165979195c13f197128c14fbe7c':
Revert "Support Emoji keyboard"
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/input_view.xml | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 86bd1e6c7..78217b01a 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -20,33 +20,26 @@ <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" > - <include - layout="@layout/emoji_keyboard_view" /> - <LinearLayout - android:id="@+id/main_keyboard_frame" +> + <!-- 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" - 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> + android:layout_height="wrap_content" /> </com.android.inputmethod.latin.InputView> |