commit c150acc7c85ff2f5eeb5bd2c6ff288df4e46a355
author Tadashi G. Takaoka <takaoka@google.com> Mon May 23 18:30:21 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue May 24 15:37:53 2011 +0900
tree 144c1dac0295c005c1d80ce3af62e9665045b89f
parent 8c08a49895ee53b798f72190e8fc642f8686b8ef

Move CandidateView into input view

Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280

java/res/layout/input_honeycomb.xml

diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml
index 8dadafd..5a7dcb0 100644
--- a/java/res/layout/input_honeycomb.xml
+++ b/java/res/layout/input_honeycomb.xml
@@ -18,16 +18,22 @@
 */
 -->
 
-<com.android.inputmethod.keyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+>
+    <include
+        layout="@layout/candidates" />
+    <com.android.inputmethod.keyboard.LatinKeyboardView
         android:id="@+id/latin_keyboard_view"
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="0dip"
         android:background="@drawable/keyboard_background_holo"
-
         latin:keyBackground="@drawable/btn_keyboard_key_honeycomb"
         latin:keyPreviewLayout="@layout/key_preview_honeycomb"
         latin:keyPreviewHeight="@dimen/key_preview_height_holo"
@@ -36,5 +42,5 @@
         latin:keyTextColorDisabled="#FF63666D"
         latin:keyLetterStyle="bold"
         latin:shadowColor="#00000000"
-        latin:shadowRadius="0.0"
-        />
+        latin:shadowRadius="0.0" />
+</LinearLayout>