diff options
Diffstat (limited to 'java/res/layout')
-rw-r--r-- | java/res/layout/candidates.xml | 1 | ||||
-rw-r--r-- | java/res/layout/input_basic.xml | 18 | ||||
-rw-r--r-- | java/res/layout/input_basic_highcontrast.xml | 18 | ||||
-rw-r--r-- | java/res/layout/input_gingerbread.xml | 18 | ||||
-rw-r--r-- | java/res/layout/input_honeycomb.xml | 18 | ||||
-rw-r--r-- | java/res/layout/input_stone_bold.xml | 18 | ||||
-rw-r--r-- | java/res/layout/input_stone_normal.xml | 18 |
7 files changed, 73 insertions, 36 deletions
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml index 3d91c1d20..5c29f737f 100644 --- a/java/res/layout/candidates.xml +++ b/java/res/layout/candidates.xml @@ -20,6 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/candidates_container" android:orientation="horizontal" android:gravity="bottom" android:layout_width="match_parent" diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml index 8666daece..ec2f60e9c 100644 --- a/java/res/layout/input_basic.xml +++ b/java/res/layout/input_basic.xml @@ -18,15 +18,21 @@ */ --> -<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" - - latin:keyBackground="@drawable/btn_keyboard_key" - /> + latin:keyBackground="@drawable/btn_keyboard_key" /> +</LinearLayout> diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml index 4829c7d7c..0a34b1fd7 100644 --- a/java/res/layout/input_basic_highcontrast.xml +++ b/java/res/layout/input_basic_highcontrast.xml @@ -18,15 +18,21 @@ */ --> -<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="@android:color/black" - - latin:keyBackground="@drawable/btn_keyboard_key3" - /> + latin:keyBackground="@drawable/btn_keyboard_key3" /> +</LinearLayout> diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml index ccca501af..f620151cf 100644 --- a/java/res/layout/input_gingerbread.xml +++ b/java/res/layout/input_gingerbread.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_dark_background" - latin:keyBackground="@drawable/btn_keyboard_key_gingerbread" - latin:keyLetterStyle="bold" - /> + latin:keyLetterStyle="bold" /> +</LinearLayout> diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml index 8dadafd81..5a7dcb034 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> diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml index a0b40684f..ca0794cef 100644 --- a/java/res/layout/input_stone_bold.xml +++ b/java/res/layout/input_stone_bold.xml @@ -18,21 +18,27 @@ */ --> -<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" - latin:keyBackground="@drawable/btn_keyboard_key_stone" latin:keyTextColor="@color/latinkeyboard_key_color_black" latin:keyTextColorDisabled="#FF808080" latin:shadowColor="@color/latinkeyboard_key_color_white" latin:keyLetterStyle="bold" latin:colorScheme="black" - latin:popupLayout="@layout/keyboard_popup_stone" - /> + latin:popupLayout="@layout/keyboard_popup_stone" /> +</LinearLayout> diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml index 41cbc16fa..9d5afb68b 100644 --- a/java/res/layout/input_stone_normal.xml +++ b/java/res/layout/input_stone_normal.xml @@ -18,20 +18,26 @@ */ --> -<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" - latin:keyBackground="@drawable/btn_keyboard_key_stone" latin:keyTextColor="@color/latinkeyboard_key_color_black" latin:keyTextColorDisabled="#FF808080" latin:shadowColor="@color/latinkeyboard_key_color_white" latin:colorScheme="black" - latin:popupLayout="@layout/keyboard_popup_stone" - /> + latin:popupLayout="@layout/keyboard_popup_stone" /> +</LinearLayout> |