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

Commit 943e88b7 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am e0502496: Revert "Remove symbols shifted layout"

* commit 'e0502496':
  Revert "Remove symbols shifted layout"
parents 183570bb e0502496
Loading
Loading
Loading
Loading
+27 −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.
*/
-->

<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>
+27 −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.
*/
-->

<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>
+12 −4
Original line number Diff line number Diff line
@@ -28,13 +28,21 @@
        <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"
            latin:backgroundType="normal" />
        <Spacer />
        <Spacer />
        <include
            latin:keyboardLayout="@xml/key_f2" />
        <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>
+40 −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.
*/
-->

<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" />
        <!-- Here is empty space. -->
        <include
            latin:keyXPos="28.0%p"
            latin:keyboardLayout="@xml/key_space"
            latin:backgroundType="normal" />
        <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
        <Spacer
            latin:keyWidth="fillRight" />
    </Row>
</merge>
+75 −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.
*/
-->

<merge
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
    <switch>
        <case
            latin:languageCode="fa"
        >
            <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
            <Key
                latin:keyLabel="&#x066C;"
                latin:keyHintLabel="&amp;"
                latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
                latin:moreKeys="&amp;" />
        </case>
        <default>
            <Key
                latin:keyLabel="\#" />
        </default>
    </switch>
    <Key
        latin:keyStyle="currencyKeyStyle" />
    <Key
        latin:keyLabel="!text/keylabel_for_symbols_percent"
        latin:moreKeys="!text/more_keys_for_symbols_percent" />
    <switch>
        <case
            latin:languageCode="fa"
        >
            <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
            <Key
                latin:keyLabel="&#x066B;"
                latin:keyHintLabel="\#"
                latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
                latin:moreKeys="\#" />
        </case>
        <default>
            <Key
                latin:keyLabel="&amp;" />
        </default>
    </switch>
    <Key
        latin:keyLabel="*"
        latin:moreKeys="!text/more_keys_for_star" />
    <!-- U+2013: "–" EN DASH
         U+2014: "—" EM DASH
         U+00B7: "·" MIDDLE DOT -->
    <Key
        latin:keyLabel="-"
        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />
    <Key
        latin:keyLabel="+"
        latin:moreKeys="!text/more_keys_for_plus" />
    <include
        latin:keyboardLayout="@xml/keys_parentheses" />
</merge>
Loading