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

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

Merge "Fix popup key preview on tablet"

parents 61393bf0 da4bfbbb

java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png

+3.81 KiB (3.95 KiB)
Loading image diff...

java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png

+2.73 KiB (3.71 KiB)
Loading image diff...

java/res/drawable/keyboard_key_feedback_honeycomb.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


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

    <item android:state_long_pressable="true"

            android:drawable="@drawable/keyboard_key_feedback_more_background" />

            android:drawable="@drawable/keyboard_key_feedback_more_background_holo" />

    <item android:drawable="@drawable/keyboard_key_feedback_background_holo" />

</selector>

java/res/layout-xlarge/keyboard_popup_honeycomb.xml

deleted100644 → 0
+0 −41
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="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:background="@drawable/keyboard_popup_panel_background_holo"

        android:paddingLeft="40dip"

        android:paddingRight="40dip"

        >

    <com.android.inputmethod.keyboard.KeyboardView

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

            android:id="@+id/KeyboardView"

            android:layout_alignParentBottom="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/latinkeyboard_transparent"



            latin:keyBackground="@drawable/btn_keyboard_key_honeycomb_popup"

            latin:keyHysteresisDistance="0dip"

            latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"

            />

</LinearLayout>

java/res/layout/input_honeycomb.xml

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


        latin:keyBackground="@drawable/btn_keyboard_key_honeycomb"

        latin:keyPreviewLayout="@layout/key_preview_honeycomb"

        latin:keyPreviewHeight="@dimen/key_preview_height_holo"

        latin:keyPreviewOffset="@dimen/key_preview_offset_holo"

        latin:popupLayout="@layout/keyboard_popup_honeycomb"

        latin:keyTextColorDisabled="#FF63666D"

        latin:keyLetterStyle="bold"