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

Commit 4aad381f authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Optimize tablet layout"

parents 40182c73 98565a9c

java/res/xml-sw600dp/kbd_10_10_7_symbols.xml

deleted100644 → 0
+0 −27
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.

*/

-->



<Keyboard

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

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

        latin:keyboardLayout="@xml/rows_10_10_7_symbols" />

</Keyboard>

java/res/xml-sw600dp/kbd_10_10_7_symbols_shift.xml

deleted100644 → 0
+0 −27
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.

*/

-->



<Keyboard

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

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

        latin:keyboardLayout="@xml/rows_10_10_7_symbols_shift" />

</Keyboard>

java/res/xml/kbd_10_10_7_symbols.xml→java/res/xml-sw600dp/key_space_symbols.xml

+3 −4
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 
*/

-->



<Keyboard

<merge

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

    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"

>

    <include

        latin:keyboardLayout="@xml/rows_symbols" />

</Keyboard>
 
        latin:keyboardLayout="@xml/key_space_5kw" />

</merge>

java/res/xml-sw600dp/key_styles_common.xml

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,20 @@ 
<merge

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

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"

        >

            <key-style

                latin:styleName="hasShiftedLetterHintStyle"

                latin:keyLabelFlags="hasShiftedLetterHint|shiftedLetterActivated" />

        </case>

        <default>

            <key-style

                latin:styleName="hasShiftedLetterHintStyle"

                latin:keyLabelFlags="hasShiftedLetterHint" />

        </default>

    </switch>

    <!-- Functional key styles -->

    <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->

    <key-style

java/res/xml-sw600dp/row_symbols4.xml

deleted100644 → 0
+0 −48
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.

*/

-->



<merge

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

>

    <Row

        latin:keyWidth="9.0%p"

        latin:backgroundType="functional"

    >

        <Key

            latin:keyStyle="toAlphaKeyStyle"

            latin:keyWidth="10.0%p" />

        <Key

            latin:keyLabel="/" />

        <include

            latin:keyboardLayout="@xml/key_f1" />

        <include

            latin:keyXPos="28.0%p"

            latin:keyboardLayout="@xml/key_space_5kw"

            latin:backgroundType="normal" />

        <Key

            latin:keyLabel="&quot;"

            latin:moreKeys="!text/more_keys_for_tablet_double_quote" />

        <Key

            latin:keyLabel="_" />

        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->

        <Spacer

            latin:keyWidth="fillRight" />

    </Row>

</merge>