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

Commit d6e8451e authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am c2a1b756: Merge change I46984565 into eclair-mr2 

Merge commit 'c2a1b756' into eclair-mr2-plus-aosp

* commit 'c2a1b756':
  Add some additional glyphs to longpress key dialogs.
parents 988734b8 c2a1b756

res/xml/kbd_symbols.xml

+6 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
        <Key android:codes="38" android:keyLabel="&amp;"/>

        <Key android:codes="42" android:keyLabel="*"

                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="†‡"

                android:popupCharacters="†‡⁂★"

        />

        <Key android:codes="45" android:keyLabel="-"

                android:popupKeyboard="@xml/kbd_popup_template"
@@ -105,7 +105,10 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="“”«»˝"

        />

        <Key android:codes="39" android:keyLabel="\'"/>

        <Key android:codes="39" android:keyLabel="\'"

                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="‘’"

        />

        <Key android:codes="58" android:keyLabel=":"/>

        <Key android:codes="59" android:keyLabel=";"/>

        <Key android:codes="47" android:keyLabel="/" />

res/xml/kbd_symbols_shift.xml

+12 −3
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ 
        <Key android:keyLabel="~" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="`"/>

        <Key android:keyLabel="|"/>

        <Key android:keyLabel="•"/>

        <Key android:keyLabel="•"

                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="♪♥♠♦♣"

        />

        <Key android:keyLabel="√"/>

        <Key android:keyLabel="π"/>

        <Key android:keyLabel="÷"/>
@@ -44,7 +47,10 @@ 
        <Key android:keyLabel="¢"/>

        <Key android:keyLabel="€"/>

        <Key android:keyLabel="°"/>

        <Key android:keyLabel="^"/>

        <Key android:keyLabel="^"

                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="↑↓←→"

        />

        <Key android:keyLabel="_"/>

        <Key android:keyLabel="="

                android:popupKeyboard="@xml/kbd_popup_template"
@@ -61,7 +67,10 @@ 
        <Key android:keyLabel="™"/>

        <Key android:keyLabel="®"/>

        <Key android:keyLabel="©"/>

        <Key android:keyLabel="¶"/>

        <Key android:keyLabel="¶"

                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="§"

        />

        <Key android:keyLabel="\\"/>

        <Key android:keyLabel="&lt;" 

                android:popupKeyboard="@xml/kbd_popup_template"