commit be819dbe2b7a5c418530a2fa1182766a4d31d6d5
author Tadashi G. Takaoka <takaoka@google.com> Tue Dec 09 17:53:24 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Dec 09 17:53:24 2014 +0900
tree 17b6f9cbe1855864c7ef445604b209c982751957
parent 45bbdc20bb613a84fef35fe685ead394c7b06d57

Revert "Add keyboard margin options to place the keyboard dynamically."

This reverts commit 8584db1461d286f8eb966c40eb0bc76e8c9df76a.

Bug: 18675223
Bug: 18675476
Change-Id: I4e25d87ac261c44b1943df832115f8cca690103a

java/res/layout/input_view.xml

diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 98ef02b..ae3c19d 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -23,18 +23,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="?attr/inputViewStyle">
-    <LinearLayout
-        android:id="@+id/horizontal_keyboard_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:gravity="bottom"
-        android:orientation="horizontal">
-        <include
-            android:id="@+id/main_keyboard_frame"
-            layout="@layout/main_keyboard_frame" />
-        <include
-            android:id="@+id/emoji_palettes_view"
-            layout="@layout/emoji_palettes_view" />
-    </LinearLayout>
+    <include
+        android:id="@+id/main_keyboard_frame"
+        layout="@layout/main_keyboard_frame" />
+    <include
+        android:id="@+id/emoji_palettes_view"
+        layout="@layout/emoji_palettes_view" />
 </com.android.inputmethod.latin.InputView>