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

Commit 9e5be6ca authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use custom theme for Keyboard theme switch"

parents 30f38adb 13a74199

java/res/drawable/btn_keyboard_key_gingerbread_popup.xml→java/res/drawable/btn_keyboard_key_popup.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

java/res/drawable/btn_keyboard_key_honeycomb_popup.xml→java/res/drawable/btn_keyboard_key_popup_honeycomb.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

java/res/layout-xlarge/candidate.xml

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:orientation="horizontal"

>

    <ImageView

        android:id="@+id/candidate_divider"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:src="@drawable/keyboard_suggest_strip_divider"

        android:paddingRight="@dimen/candidate_padding"

        android:paddingLeft="@dimen/candidate_padding"

        android:visibility="invisible"

        android:focusable="false"

        android:clickable="false"

        android:gravity="center_vertical|center_horizontal" />

    <Button

        android:id="@+id/candidate_word"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="@dimen/candidate_min_width"

        android:textSize="@dimen/candidate_text_size"

        android:textColor="@color/candidate_normal"

        android:background="@drawable/btn_candidate_holo"

        android:focusable="true"

        android:clickable="true"

        android:gravity="center_vertical|center_horizontal" />

    <TextView

        android:id="@+id/candidate_debug_info"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:textSize="10dip"

        android:textColor="#ff808080"

        android:focusable="false"

        android:clickable="false"

        android:gravity="bottom" />

</LinearLayout>

java/res/layout-xlarge/candidate_preview.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textSize="18sp"

    android:textColor="?android:attr/textColorPrimaryInverse"

    android:minWidth="32dip"

    android:gravity="center"

    android:background="@drawable/keyboard_popup_panel_background_holo" />

java/res/layout-xlarge/candidates.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/keyboard_suggest_strip_holo"

        android:paddingRight="@dimen/candidate_strip_padding"

        android:paddingLeft="@dimen/candidate_strip_padding"

        style="?attr/suggestionsStripBackgroundStyle"

    >

        <HorizontalScrollView

            android:layout_width="match_parent"