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

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

Merge "Remove symbols shifted layout related code"

parents 8f4d5d5f 1cd02785

java/res/values/attrs.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -370,7 +370,6 @@ 
            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="symbols" value="5" />

            <enum name="symbols" value="5" />

            <enum name="symbolsShifted" value="6"  />

            <enum name="phone" value="7"  />

            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />

            <enum name="number" value="9"  />
@@ -425,7 +424,6 @@ 
            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="symbols" value="5" />

            <enum name="symbols" value="5" />

            <enum name="symbolsShifted" value="6"  />

            <enum name="phone" value="7"  />

            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />

            <enum name="number" value="9"  />

java/res/xml-sw600dp/keys_pcqwerty2_right3.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
>

>

    <switch>

    <switch>

        <case

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

            latin:keyboardLayoutSetElement="symbols"

        >

        >

            <Key

            <Key

                latin:keyLabel="["

                latin:keyLabel="["

java/res/xml-sw600dp/keys_pcqwerty3_right2.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
>

>

    <switch>

    <switch>

        <case

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

            latin:keyboardLayoutSetElement="symbols"

        >

        >

            <Key

            <Key

                latin:keyLabel=";"

                latin:keyLabel=";"

java/res/xml-sw600dp/keys_pcqwerty4_right3.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
>

>

    <switch>

    <switch>

        <case

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

            latin:keyboardLayoutSetElement="symbols"

        >

        >

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

java/res/xml-sw600dp/rowkeys_pcqwerty1.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
>

>

    <switch>

    <switch>

        <case

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

            latin:keyboardLayoutSetElement="symbols"

        >

        >

            <include

            <include

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

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