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

Commit 64e245f6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24211 into eclair 

* changes:
  Adjust the size of bottom row of keys for email mode. Fix for 2099889
parents b50a1a3c d9688c77

res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -191,4 +191,15 @@ 


    <!-- appears above image showing how to access keyboard settings -->

    <string name="keyboard_settings"><font size="17"><b>Keyboard settings\n</b></font><font size="3">\n</font>Touch \u0026 hold the <b>\?123\</b> key.</string>

    

    <!-- popular web domains for the locale - most popular, displayed on the keyboard -->

    <string name="popular_domain_0">".com"</string>

    <!-- popular web domains for the locale - item 1, displayed in the popup -->

    <string name="popular_domain_1">".net"</string>

    <!-- popular web domains for the locale - item 2, displayed in the popup -->

    <string name="popular_domain_2">".org"</string>

    <!-- popular web domains for the locale - item 3, displayed in the popup -->

    <string name="popular_domain_3">".gov"</string>

    <!-- popular web domains for the locale - item 4, displayed in the popup -->

    <string name="popular_domain_4">".edu"</string>

</resources>

res/xml-de/kbd_qwerty.xml

+6 −2
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel=".com" android:keyOutputText=".com"

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:keyLabel="/" android:keyWidth="15%p"/>
@@ -135,8 +136,11 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="," android:keyWidth="15%p" />

        <Key android:keyLabel="\@" android:keyWidth="15%p"/>

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="15%p" android:isRepeatable="true"/>

res/xml-fr/kbd_qwerty.xml

+6 −2
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters=""

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel=".com" android:keyOutputText=".com"

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:keyLabel="/" android:keyWidth="15%p"/>
@@ -137,8 +138,11 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters=""

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="," android:keyWidth="15%p" />

        <Key android:keyLabel="\@" android:keyWidth="15%p"/>

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" 

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="15%p" android:isRepeatable="true"/>

res/xml/kbd_qwerty.xml

+9 −5
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel=".com" android:keyOutputText=".com"

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:keyLabel="/" android:keyWidth="15%p"/>
@@ -146,13 +147,16 @@ 
                android:popupKeyboard="@xml/kbd_popup_template"

                android:popupCharacters="_"

                android:keyWidth="20%p" android:keyEdgeFlags="left"/>

        <Key android:keyLabel="," android:keyWidth="10%p" />

        <Key android:keyLabel="\@" android:keyWidth="20%p"/>

        <Key android:keyLabel="\@" android:keyWidth="15%p"/>

        <Key android:keyLabel="@string/popular_domain_0"

                android:keyOutputText="@string/popular_domain_0"

                android:popupKeyboard="@xml/popup_domains"

                android:keyWidth="15%p"/>

        <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"

                android:iconPreview="@drawable/sym_keyboard_feedback_space"

                android:keyWidth="20%p" android:isRepeatable="true"/>

                android:keyWidth="15%p" android:isRepeatable="true"/>

        <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"

                android:keyWidth="10%p"/>

                android:keyWidth="15%p"/>

        <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"

                android:iconPreview="@drawable/sym_keyboard_feedback_return"

                android:keyWidth="20%p" android:keyEdgeFlags="right"/>

res/xml/popup_domains.xml

+8 −4
Original line number Diff line number Diff line
@@ -26,9 +26,13 @@ 
    >



    <Row android:rowEdgeFlags="top|bottom">

        <Key android:keyLabel=".net" android:keyOutputText=".net" android:keyEdgeFlags="left" />

        <Key android:keyLabel=".org" android:keyOutputText=".org"/>

        <Key android:keyLabel=".gov" android:keyOutputText=".gov"/>

        <Key android:keyLabel=".tv" android:keyOutputText=".tv" android:keyEdgeFlags="right" />

        <Key android:keyLabel="@string/popular_domain_1"

            android:keyOutputText="@string/popular_domain_1" android:keyEdgeFlags="left" />

        <Key android:keyLabel="@string/popular_domain_2"

            android:keyOutputText="@string/popular_domain_2"/>

        <Key android:keyLabel="@string/popular_domain_3"

            android:keyOutputText="@string/popular_domain_3"/>

        <Key android:keyLabel="@string/popular_domain_4"

            android:keyOutputText="@string/popular_domain_4" android:keyEdgeFlags="right" />

    </Row>

</Keyboard>