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

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

Merge "Rename PopupMiniKeyboardView to MiniKeyboardView"

parents fcee70ea 9237a726

java/res/layout/keyboard_popup.xml→java/res/layout/mini_keyboard.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="?attr/popupMiniKeyboardPanelStyle"

        style="?attr/miniKeyboardPanelStyle"

        >

    <com.android.inputmethod.keyboard.PopupMiniKeyboardView

    <com.android.inputmethod.keyboard.MiniKeyboardView

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

            android:id="@+id/mini_keyboard_view"

            android:layout_alignParentBottom="true"

java/res/values-ar/donottranslate-altchars.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
         \u064b: ARABIC FATHATAN

         \u064d: ARABIC KASRATAN -->

    <string name="alternates_for_punctuation">"\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string>

    <integer name="popup_keyboard_column_for_punctuation">9</integer>

    <integer name="mini_keyboard_column_for_punctuation">9</integer>

    <string name="keyhintlabel_for_punctuation">\u064b</string>

    <string name="keylabel_for_symbols_1">"١"</string>

    <string name="keylabel_for_symbols_2">"٢"</string>

java/res/values-sw600dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,5 +39,5 @@ 
    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>

    <integer name="config_max_popup_keyboard_column">5</integer>

    <integer name="config_max_mini_keyboard_column">5</integer>

</resources>

java/res/values-sw768dp/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->

    <string name="config_default_keyboard_theme_id" translatable="false">5</string>

    <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>

    <integer name="config_max_popup_keyboard_column">5</integer>

    <integer name="config_max_mini_keyboard_column">5</integer>

    <!--  Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" -->

    <integer name="log_screen_metrics">2</integer>

</resources>

java/res/values/attrs.xml

+8 −8
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
        <attr name="latinKeyboardStyle" format="reference" />

        <!-- KeyboardView style -->

        <attr name="keyboardViewStyle" format="reference" />

        <!-- PopupMiniKeyboardView style -->

        <attr name="popupMiniKeyboardViewStyle" format="reference" />

        <attr name="popupMiniKeyboardPanelStyle" format="reference" />

        <!-- MiniKeyboardView style -->

        <attr name="miniKeyboardViewStyle" format="reference" />

        <attr name="miniKeyboardPanelStyle" format="reference" />

        <!-- Suggestions strip style -->

        <attr name="suggestionsStripBackgroundStyle" format="reference" />

        <attr name="suggestionBackgroundStyle" format="reference" />
@@ -95,7 +95,7 @@ 
        <!-- Amount to offset the touch Y coordinate by, for bias correction. -->

        <attr name="verticalCorrection" format="dimension" />



        <!-- Layout resource for popup keyboards. -->

        <!-- Layout resource for popup panel -->

        <attr name="popupLayout" format="reference" />



        <attr name="shadowColor" format="color" />
@@ -153,8 +153,8 @@ 
        <attr name="horizontalGap" format="dimension|fraction" />

        <!-- Default vertical gap between rows of keys. -->

        <attr name="verticalGap" format="dimension|fraction" />

        <!-- Popup keyboard layout template -->

        <attr name="popupKeyboardTemplate" format="reference" />

        <!-- Popup panel layout template -->

        <attr name="popupTemplate" format="reference" />

        <!-- Locale of the keyboard layout -->

        <attr name="keyboardLocale" format="string" />

        <!-- True if the keyboard is Right-To-Left -->
@@ -180,8 +180,8 @@ 
        <attr name="code" format="integer" />

        <!-- The characters to display in the popup keyboard. -->

        <attr name="popupCharacters" format="string" />

        <!-- Maximum column of popup keyboard -->

        <attr name="maxPopupKeyboardColumn" format="integer" />

        <!-- Maximum column of mini keyboard -->

        <attr name="maxMiniKeyboardColumn" format="integer" />

        <!-- Whether this is a functional key which has different key top than normal key. -->

        <attr name="isFunctional" format="boolean" />

        <!-- Whether this is a toggle key. -->