From 8584db1461d286f8eb966c40eb0bc76e8c9df76a Mon Sep 17 00:00:00 2001
From: Andy Wang <andywang@google.com>
Date: Tue, 2 Dec 2014 13:01:11 +0900
Subject: Add keyboard margin options to place the keyboard dynamically.

Keyboard location and location can now be set in the debug options
section.

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

(limited to 'java/res/layout')

diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index ae3c19db5..98ef02b25 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -23,10 +23,18 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="?attr/inputViewStyle">
-    <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
+        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>
 </com.android.inputmethod.latin.InputView>
-- 
cgit v1.2.3-83-g751a