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

Commit 13a6c8c1 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 1508c0e8: Add a new preference item to show/hide the settings key. 

Merge commit '1508c0e8' into gingerbread-plus-aosp

* commit '1508c0e8':
  Add a new preference item to show/hide the settings key.
parents d6210de7 1508c0e8

java/res/values/donottranslate.xml

+8 −0
Original line number Diff line number Diff line
@@ -24,4 +24,12 @@ 
    <string name="sentence_separators">.,!?)</string>

    <!-- Symbols that are suggested between words -->

    <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string>



    <!-- Option values to show/hide the settings key in onscreen keyboard -->

    <!-- Automatically decide to show or hide the settings key -->

    <string name="settings_key_mode_auto" translatable="false">0</string>

    <!-- Always show the settings key -->

    <string name="settings_key_mode_always_show" translatable="false">1</string>

    <!-- Always hide the settings key -->

    <string name="settings_key_mode_always_hide" translatable="false">2</string>

</resources>

java/res/values/strings.xml

+21 −0
Original line number Diff line number Diff line
@@ -91,6 +91,27 @@ 
    <!-- Description for auto completion -->

    <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string>

    

    <!-- Option to show/hide the settings key -->

    <string name="prefs_settings_key">Show settings key</string>

    <!-- Array of the settings key mode values -->

    <string-array name="settings_key_modes_values" translatable="false">

        <item>@string/settings_key_mode_auto</item>

        <item>@string/settings_key_mode_always_show</item>

        <item>@string/settings_key_mode_always_hide</item>

    </string-array>

    <!-- Option to automatically decide to show/hide the settings key -->

    <string name="settings_key_mode_auto_name">Automatic</string>

    <!-- Option to always show the settings key -->

    <string name="settings_key_mode_always_show_name">Always show</string>

    <!-- Option to always hide the settings key -->

    <string name="settings_key_mode_always_hide_name">Always hide</string>

    <!-- Array of the settings key modes -->

    <string-array name="settings_key_modes">

        <item>@string/settings_key_mode_auto_name</item>

        <item>@string/settings_key_mode_always_show_name</item>

        <item>@string/settings_key_mode_always_hide_name</item>

    </string-array>



    <!-- Option to enable bigram completion -->

    <string name="bigram_suggestion">Bigram Suggestions</string>

    <!-- Description for auto completion -->

java/res/xml-da/kbd_qwerty.xml

+186 −18
Original line number Diff line number Diff line
@@ -165,6 +165,184 @@ 
    </Row>

    <Row

        android:keyboardMode="@+id/mode_normal"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true"

            android:isRepeatable="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_url"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:keyLabel="/"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true"

            android:isRepeatable="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_email"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:keyLabel="\@"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true"

            android:isRepeatable="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_im"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="40%p"

            android:isModifier="true"

            android:isRepeatable="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:keyLabel=":-)"

            android:keyOutputText=":-) "

            android:popupKeyboard="@xml/popup_smileys"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_webentry"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:isRepeatable="true" />

        <Key

            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_keyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:keyWidth="20%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="20%p"

            android:isModifier="true"

            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_normal_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key
@@ -177,13 +355,11 @@ 
            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"
@@ -195,7 +371,6 @@ 
        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"
@@ -206,7 +381,8 @@ 
            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_url"

        android:keyboardMode="@+id/mode_url_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key
@@ -219,11 +395,9 @@ 
            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="/"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"
@@ -235,7 +409,6 @@ 
        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"
@@ -246,7 +419,8 @@ 
            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_email"

        android:keyboardMode="@+id/mode_email_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key
@@ -259,7 +433,6 @@ 
            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="\@"
@@ -284,7 +457,8 @@ 
            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_im"

        android:keyboardMode="@+id/mode_im_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key
@@ -297,13 +471,11 @@ 
            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"
@@ -315,7 +487,6 @@ 
        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:keyLabel=":-)"
@@ -326,7 +497,8 @@ 
            android:keyEdgeFlags="right" />

    </Row>

    <Row

        android:keyboardMode="@+id/mode_webentry"

        android:keyboardMode="@+id/mode_webentry_with_settings_key"

        android:keyWidth="10%p"

        android:rowEdgeFlags="bottom"

    >

        <Key
@@ -339,13 +511,11 @@ 
            android:codes="@integer/key_settings"

            android:keyIcon="@drawable/sym_keyboard_settings"

            android:iconPreview="@drawable/sym_keyboard_feedback_settings"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_f1"

            android:keyIcon="@drawable/sym_keyboard_mic"

            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_space"
@@ -358,12 +528,10 @@ 
            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_keyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="@integer/key_return"

java/res/xml-da/kbd_qwerty_black.xml

+174 −32

File changed.

Preview size limit exceeded, changes collapsed.

java/res/xml-de/kbd_qwerty.xml

+186 −18

File changed.

Preview size limit exceeded, changes collapsed.