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

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

Merge "Add language switch key only to the phone layouts"

parents 89ffb212 81d4e3cd

java/res/drawable-hdpi/sym_keyboard_language_switch.png

0 → 100644
+2.04 KiB
Loading image diff...

java/res/drawable-mdpi/sym_keyboard_language_switch.png

0 → 100644
+1.26 KiB
Loading image diff...

java/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
        <attr name="iconShiftKeyShifted" format="reference" />

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

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

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

    </declare-styleable>



    <declare-styleable name="Keyboard_Key">
@@ -296,6 +297,7 @@ 
            <enum name="iconShortcutForLabel" value="9" />

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

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

            <enum name="iconLanguageSwitchKey" value="14" />

        </attr>

        <!-- The icon for disabled key -->

        <attr name="keyIconDisabled" format="enum">
@@ -361,6 +363,7 @@ 
        <attr name="clobberSettingsKey" format="boolean" />

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

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

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

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

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

            <!-- This should be aligned with EditorInfo.IME_ACTION_* -->

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

+2 −0
Original line number Diff line number Diff line
@@ -34,5 +34,7 @@ 
        <item name="iconShiftKeyShifted">@drawable/sym_bkeyboard_shift_locked</item>

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

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

        <!-- TODO: Needs dedicated black theme globe icon -->

        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>

    </style>

</resources>

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

+1 −0
Original line number Diff line number Diff line
@@ -33,5 +33,6 @@ 
        <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_holo</item>

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

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

        <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>

    </style>

</resources>