Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c150acc7 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Move CandidateView into input view 

Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
parent 8c08a498

java/res/layout-xlarge/candidates.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

java/res/layout/candidates.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

java/res/layout/input_basic.xml

+12 −6
Original line number Diff line number Diff line
@@ -18,15 +18,21 @@ 
*/

-->



<com.android.inputmethod.keyboard.LatinKeyboardView

<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>

java/res/layout/input_basic_highcontrast.xml

+12 −6
Original line number Diff line number Diff line
@@ -18,15 +18,21 @@ 
*/

-->



<com.android.inputmethod.keyboard.LatinKeyboardView

<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>

java/res/layout/input_gingerbread.xml

+12 −6
Original line number Diff line number Diff line
@@ -18,16 +18,22 @@ 
*/

-->



<com.android.inputmethod.keyboard.LatinKeyboardView

<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>