aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-08-30 07:23:42 +0000
committerKen Wakasa <kwakasa@google.com>2013-08-30 07:23:42 +0000
commitaabc97233826da69edbadfc7c1465a505a1fe2ec (patch)
tree574863d0acfbb617427ae4a4030a68fdec82ca0c /java/res/layout
parentd7791a93b0dee268a9e97f06fe5abcf6082e0ed1 (diff)
downloadlatinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.tar.gz
latinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.tar.xz
latinime-aabc97233826da69edbadfc7c1465a505a1fe2ec.zip
Revert "Support Emoji keyboard"
This reverts commit d7791a93b0dee268a9e97f06fe5abcf6082e0ed1. Change-Id: I5ca4c0227f97540e8a22b487b5056dfa3611082b
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/input_view.xml43
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>