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

Commit 7bd714c0 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add extra key icons to KeyboardIconsSet 

  * Get rid of Key.keyIconShifted attribute.
    Add Keyboard.iconShiftKeyShifted to KeyboardIconsSet.
  * Get rid of LatinKeyboardView.disabledShortcutIcon attribute.
    Add Keyboard.iconShortcurKeyDisabled to KeyboardIconsSet.
  * Add Keyboard.iconSpaceKeyForNumber to KeyboardIconsSet.
  * Fix misplaced autoCorrectionSpacebarLedIcon resources.

Change-Id: I381bff3789254977ab3cb18f58f95b3c433b1e1a
parent 1ebedd7a

java/res/values/attrs.xml

+7 −8
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 
    </declare-styleable>



    <declare-styleable name="LatinKeyboardView">

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

    </declare-styleable>



    <declare-styleable name="SuggestionsView">
@@ -185,7 +184,9 @@ 
        <attr name="iconTabKey" format="reference" />

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

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

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

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

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

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

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

    </declare-styleable>
@@ -248,16 +249,14 @@ 
            <enum name="iconTabKey" value="7" />

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

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

        </attr>

        <!-- Shift key icon for shifted state -->

        <attr name="keyIconShifted" format="enum">

            <!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->

            <enum name="iconShiftedShiftKey" value="10" />

            <enum name="iconShortcutKeyDisabled" value="10" />

            <enum name="iconSpaceKeyForNumberLayout" value="11" />

            <enum name="iconShiftKeyShifted" value="12" />

        </attr>

        <!-- The icon to show in the popup preview. -->

        <attr name="keyIconPreview" format="enum">

            <!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->

            <enum name="iconPreviewTabKey" value="11" />

            <enum name="iconPreviewTabKey" value="13" />

        </attr>

        <!-- The key style to specify a set of key attributes defined by <key_style/> -->

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

java/res/values/keyboard-icons-black.xml

+3 −4
Original line number Diff line number Diff line
@@ -30,10 +30,9 @@ 
        <item name="iconTabKey">@drawable/sym_bkeyboard_tab</item>

        <item name="iconShortcutKey">@drawable/sym_bkeyboard_mic</item>

        <item name="iconShortcutForLabel">@drawable/sym_bkeyboard_label_mic</item>

        <item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item>

        <item name="iconShortcutKeyDisabled">@drawable/sym_bkeyboard_voice_off</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_bkeyboard_space</item>

        <item name="iconShiftKeyShifted">@drawable/sym_bkeyboard_shift_locked</item>

        <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>

        <!-- LatinKeyboard icons -->

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>

        <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>

    </style>

</resources>

java/res/values/keyboard-icons-ics.xml

+4 −5
Original line number Diff line number Diff line
@@ -23,16 +23,15 @@ 
        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>

        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>

        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>

        <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>

        <item name="iconSpaceKey">@null</item>

        <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>

        <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item>

        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>

        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>

        <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item>

        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>

        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo</item>

        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item>

        <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>

        <!-- LatinKeyboard icons -->

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

    </style>

</resources>

java/res/values/keyboard-icons-white.xml

+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
        <item name="iconTabKey">@drawable/sym_keyboard_tab</item>

        <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>

        <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic</item>

        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>

        <!-- TODO: Needs non-holo disabled shortcut icon drawable -->

        <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_holo</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space</item>

        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked</item>

        <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>

        <!-- LatinKeyboard icons -->

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

    </style>

</resources>

java/res/values/styles.xml

+2 −9
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
    </style>

    <style name="LatinKeyboard">

        <item name="autoCorrectionSpacebarLedEnabled">true</item>

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>

        <item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>

        <item name="spacebarTextColor">#FFC0C0C0</item>

        <item name="spacebarTextShadowColor">#80000000</item>
@@ -74,8 +75,6 @@ 
    <style

        name="LatinKeyboardView"

        parent="KeyboardView">

        <!-- TODO: Needs non-holo disabled shortcut icon drawable -->

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

    </style>

    <style

        name="MiniKeyboard"
@@ -144,8 +143,6 @@ 
        name="LatinKeyboardView.HighContrast"

        parent="KeyboardView.HighContrast"

    >

        <!-- TODO: Needs non-holo disabled shortcut icon drawable -->

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

    </style>

    <!-- Theme "Stone" -->

    <style
@@ -183,7 +180,6 @@ 
        name="LatinKeyboardView.Stone"

        parent="KeyboardView.Stone"

    >

        <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>

    </style>

    <style

        name="MiniKeyboard.Stone"
@@ -218,7 +214,6 @@ 
        name="LatinKeyboardView.Stone.Bold"

        parent="KeyboardView.Stone.Bold"

    >

        <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>

    </style>

    <!-- Theme "Gingerbread" -->

    <style
@@ -242,8 +237,6 @@ 
        name="LatinKeyboardView.Gingerbread"

        parent="KeyboardView.Gingerbread"

    >

        <!-- TODO: Needs non-holo disabled shortcut icon drawable -->

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

    </style>

    <style

        name="MiniKeyboard.Gingerbread"
@@ -276,6 +269,7 @@ 
        parent="LatinKeyboard"

    >

        <item name="autoCorrectionSpacebarLedEnabled">false</item>

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>

    </style>

    <style

        name="KeyboardView.IceCreamSandwich"
@@ -304,7 +298,6 @@ 
        name="LatinKeyboardView.IceCreamSandwich"

        parent="KeyboardView.IceCreamSandwich"

    >

        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>

        </style>

    <style

        name="MiniKeyboard.IceCreamSandwich"