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

Commit dc62c711 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Reorder keys around the spacebar 

This CL reorders keys around the spacebar.
- On phone's symbols and symbols shift layout, the comma key is moved
  to the left of the spacebar to aligned with main layout.
- On tablet's layout, the comma key is moved to the left of the
  spacebar on all layout to aligned with the same layout of
  phone's. Also the comma key has "settings" as more keys.
- In Arabic and Perisan, the comma key of tablet already has some more keys
  This CL remove "/" and add "settings" instead.

Bug: 15281451
Change-Id: I6e0e75e4d4abfb1f356e7499be91424c7c57c58b
parent 9a2162e6

java/res/xml/keys_comma_period_symbols.xml→java/res/xml-sw600dp/key_comma.xml

+47 −0
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2013, The Android Open Source Project

** Copyright 2014, 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.
@@ -20,11 +20,28 @@ 


<merge

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

>

    <!-- The table comma key which may have settings as popup key. -->

    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->

    <key-style

        latin:styleName="baseTabletCommaKeyStyle"

        latin:keySpec="!text/keyspec_tablet_comma"

        latin:keyHintLabel="!text/keyhintlabel_tablet_comma"

        latin:keyLabelFlags="hasPopupHint"

        latin:parentStyle="hasShiftedLetterHintStyle" />

    <switch>

        <case

            latin:clobberSettingsKey="true"

        >

            <Key

        latin:keySpec="!text/keyspec_comma" />

    <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

                latin:moreKeys="!text/morekeys_tablet_comma"

                latin:keyStyle="baseTabletCommaKeyStyle" />

        </case>

        <!-- clobberSettingsKey="false" -->

        <default>

            <Key

        latin:keySpec="."

        latin:moreKeys="&#x2026;" />

                latin:moreKeys="!text/morekeys_tablet_comma,!text/keyspec_settings"

                latin:keyStyle="baseTabletCommaKeyStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/keys_comma_period.xml→java/res/xml-sw600dp/key_period.xml

+3 −8
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--

/*

**

** Copyright 2013, The Android Open Source Project

** Copyright 2014, 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.
@@ -21,13 +21,8 @@ 
<merge

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

>

    <Key

        latin:keySpec="!text/keyspec_tablet_comma"

        latin:keyHintLabel="!text/keyhintlabel_tablet_comma"

        latin:keyLabelFlags="hasPopupHint"

        latin:moreKeys="!text/morekeys_tablet_comma"

        latin:backgroundType="functional"

        latin:keyStyle="hasShiftedLetterHintStyle" />

    <!-- The table period key which may have different label depending on locale -->

    <!-- Kept as a separate file for cleaner overriding by an overlay.  -->

    <switch>

        <case

            latin:languageCode="hi"

java/res/xml-sw600dp/key_styles_common.xml

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
                latin:keyLabelFlags="hasShiftedLetterHint" />

        </default>

    </switch>

    <!-- Base key style for the key which may have settings key as more keys. -->

    <include

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

    <!-- 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_dvorak4.xml

+7 −7
Original line number Diff line number Diff line
@@ -30,19 +30,19 @@ 
            latin:keyWidth="10.0%p" />

        <include

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

        <include

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

        <Key

            latin:keySpec="_"

            latin:keyHintLabel="-"

            latin:moreKeys="-"

            latin:keyStyle="hasShiftedLetterHintStyle" />

        <include

            latin:keyXPos="28.0%p"

            latin:keyboardLayout="@xml/key_space_5kw"

            latin:backgroundType="normal" />

        <include

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

        <include

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

        <Key

            latin:keySpec="-"

            latin:keyHintLabel="_"

            latin:moreKeys="_"

            latin:keyStyle="hasShiftedLetterHintStyle" />

        <include

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

    </Row>

java/res/xml-sw600dp/row_qwerty4.xml

+7 −4
Original line number Diff line number Diff line
@@ -29,15 +29,18 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

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

        <include

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

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

        <Key

            latin:keySpec="_" />

        <!-- Space key. -->

        <include

            latin:keyXPos="28.0%p"

            latin:keyboardLayout="@xml/key_space_5kw"

            latin:backgroundType="normal" />

        <include

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

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

        <include

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

        <include

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

    </Row>