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

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

Merge "Override the keyboard height per device"

parents acb6c544 e49a987c

java/res/values-land/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
-->



<resources>

    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=0.260in -->

    <dimen name="keyboardHeight">1.100in</dimen>

    <!-- Preferable keyboard height in absolute scale: 1.100in -->

    <!-- This keyboardHeight value should match with keyboard-heights.xml -->

    <dimen name="keyboardHeight">176.0dp</dimen>

    <fraction name="minKeyboardHeight">45%p</fraction>

    <!-- key_height + key_bottom_gap = popup_key_height -->

<!--    <dimen name="key_height">0.260in</dimen>-->
@@ -31,7 +32,6 @@ 
    <fraction name="key_bottom_gap">4.330%p</fraction>

    <fraction name="key_horizontal_gap">0.405%p</fraction>



    <dimen name="keyboardHeight_stone">0.984in</dimen>

    <fraction name="key_bottom_gap_stone">5.010%p</fraction>

    <fraction name="key_horizontal_gap_stone">1.159%p</fraction>

java/res/values-land/keyboard-heights.xml

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

<!--

/*

**

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

*/

-->



<!-- Preferable keyboard height in absolute scale: 1.100in -->

<resources>

    <!-- Build.HARDWARE,keyboard_height_in_dp -->

    <string-array name="keyboard_heights" translatable="false">

        <!-- Droid -->

        <item>sholes,194.3333</item>

        <!-- Nexus One -->

        <item>mahimahi,186.2667</item>

        <!-- Nexus S -->

        <item>herring,171.9385</item>

        <!-- Galaxy Nexus -->

        <item>tuna,173.4207</item>

    </string-array>

</resources>

java/res/values-sw600dp-land/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
-->



<resources>

    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->

    <dimen name="keyboardHeight">45.0mm</dimen>

    <!-- Preferable keyboard height in absolute scale: 45.0mm -->

    <!-- This keyboardHeight value should match with keyboard-heights.xml -->

    <dimen name="keyboardHeight">283.5dp</dimen>

    <fraction name="minKeyboardHeight">45%p</fraction>



    <fraction name="keyboard_top_padding">2.444%p</fraction>
@@ -28,7 +29,6 @@ 
    <fraction name="key_bottom_gap">4.911%p</fraction>

    <fraction name="key_horizontal_gap">1.284%p</fraction>



    <dimen name="keyboardHeight_stone">45.0mm</dimen>

    <fraction name="key_bottom_gap_stone">4.355%p</fraction>

    <fraction name="key_horizontal_gap_stone">1.505%p</fraction>

java/res/values-sw600dp-land/keyboard-heights.xml

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

<!--

/*

**

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

*/

-->



<!-- Preferable keyboard height in absolute scale: 45.0mm -->

<resources>

    <!-- Build.HARDWARE,keyboard_height_in_dp -->

    <string-array name="keyboard_heights" translatable="false">

        <!-- Xoom -->

        <item>stingray,265.4378</item>

    </string-array>

</resources>

java/res/values-sw600dp/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
-->



<resources>

    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->

    <dimen name="keyboardHeight">48.0mm</dimen>

    <!-- Preferable keyboard height in absolute scale: 48.0mm -->

    <!-- This keyboardHeight value should match with keyboard-heights.xml -->

    <dimen name="keyboardHeight">302.4dp</dimen>

    <fraction name="maxKeyboardHeight">50%p</fraction>

    <fraction name="minKeyboardHeight">-35.0%p</fraction>
@@ -31,7 +32,6 @@ 
    <fraction name="key_bottom_gap">3.750%p</fraction>

    <fraction name="key_horizontal_gap">1.857%p</fraction>



    <dimen name="keyboardHeight_stone">48.0mm</dimen>

    <fraction name="key_bottom_gap_stone">3.75%p</fraction>

    <fraction name="key_horizontal_gap_stone">1.602%p</fraction>