From e84f8c3308428bb68574bb85a56b4777bfefd38c Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 9 Dec 2014 09:00:12 +0000
Subject: am be819dbe: Revert "Add keyboard margin options to place the
 keyboard dynamically."

* commit 'be819dbe2b7a5c418530a2fa1182766a4d31d6d5':
  Revert "Add keyboard margin options to place the keyboard dynamically."

Change-Id: I4d0d31b04aa083e32ea86cf394444a5eec4fe647
---
 java/res/layout/input_view.xml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'java/res/layout')

diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 98ef02b25..ae3c19db5 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>
-- 
cgit v1.2.3-83-g751a