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

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

Merge "Fix calculation of more keys keyboard position based on key preview" into jb-dev

parents 5a40dcaf 7ecc1081

java/res/values-hdpi/keyboard_key_feedback_background_holo.xml

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

<!--

/*

**

** Copyright 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.

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

*/

-->



<resources>

    <dimen name="keyboard_key_feedback_background_holo_width">46.67dp</dimen>

    <dimen name="keyboard_key_feedback_background_holo_height">58.67dp</dimen>

</resources>

java/res/values-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    <fraction name="key_uppercase_letter_ratio">40%</fraction>

    <fraction name="key_preview_text_ratio">90%</fraction>

    <fraction name="spacebar_text_ratio">40.000%</fraction>

    <dimen name="key_preview_offset">12.8dp</dimen>

    <dimen name="key_preview_offset">0.0dp</dimen>



    <dimen name="key_preview_offset_ics">1.6dp</dimen>

    <!-- popup_key_height x -0.5 -->

java/res/values-mdpi/keyboard_key_feedback_background_holo.xml

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

<!--

/*

**

** Copyright 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.

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

*/

-->



<resources>

    <dimen name="keyboard_key_feedback_background_holo_width">46dp</dimen>

    <dimen name="keyboard_key_feedback_background_holo_height">58dp</dimen>

</resources>

java/res/values-xhdpi/keyboard_key_feedback_background_holo.xml

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

<!--

/*

**

** Copyright 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.

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

*/

-->



<resources>

    <dimen name="keyboard_key_feedback_background_holo_width">47dp</dimen>

    <dimen name="keyboard_key_feedback_background_holo_height">57dp</dimen>

</resources>

java/res/values/attrs.xml

+0 −4
Original line number Diff line number Diff line
@@ -91,10 +91,6 @@ 
        <attr name="keyPreviewLeftBackground" format="reference" />

        <!-- The background for the right edge key press feedback. -->

        <attr name="keyPreviewRightBackground" format="reference" />

        <!-- The width of rectangle part of the key press feedback background. -->

        <attr name="keyPreviewBackgroundWidth" format="dimension" />

        <!-- The height of rectangle part of the key press feedback background. -->

        <attr name="keyPreviewBackgroundHeight" format="dimension" />

        <!-- The text color for key press feedback. -->

        <attr name="keyPreviewTextColor" format="color" />

        <!-- Vertical offset of the key press feedback from the key. -->