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

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

Move icon declaration to Keyboard theme 

Bug: 4436327
Change-Id: I074014d28dcb323b60dbc8fd9e169c75c393e0b3
parent 72934bd5

java/res/values/attrs.xml

+68 −5
Original line number Diff line number Diff line
@@ -141,6 +141,35 @@ 
        <attr name="popupKeyboardTemplate" format="reference" />

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

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

        <!-- Icon set for key top and key preview. -->

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    </declare-styleable>



    <declare-styleable name="Keyboard_Key">
@@ -163,8 +192,6 @@ 
        <attr name="isSticky" format="boolean" />

        <!-- Whether long-pressing on this key will make it repeat. -->

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

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

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

        <!-- The string of characters to output when this key is pressed. -->

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

        <!-- The label to display on the key. -->
@@ -182,11 +209,47 @@ 
            <flag name="hasUppercaseLetter" value="0x40" />

        </attr>

        <!-- The icon to display on the key instead of the label. -->

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

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

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

            <enum name="iconShiftKey" value="1" />

            <enum name="iconToSymbolKey" value="2" />

            <enum name="iconToSymbolKeyWithShortcut" value="3" />

            <enum name="iconDeleteKey" value="4" />

            <enum name="iconSettingsKey" value="5" />

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

            <enum name="iconSpaceKey" value="7" />

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

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

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

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

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

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

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

            <enum name="iconNum5Key" value="15" />

            <enum name="iconNum6Key" value="16" />

            <enum name="iconNum7Key" value="17" />

            <enum name="iconNum8Key" value="18" />

            <enum name="iconNum9Key" value="19" />

            <enum name="iconNum0Key" value="20" />

            <enum name="iconNumStarKey" value="21" />

            <enum name="iconNumPoundKey" value="22" />

            <enum name="iconNumAltKey" value="23" />

        </attr>

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

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

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

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

        </attr>

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

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

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

            <enum name="iconPreviewSpaceKey" value="25" />

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

            <enum name="iconPreviewSettingsKey" value="27" />

            <enum name="iconPreviewShortcutKey" value="28" />

        </attr>

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

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

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

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

        <!-- The key is enabled and responds on press. -->

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

        <!-- Visual insets -->

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <style name="KeyboardIcons.Black" parent="android:Theme.Light">

        <item name="iconShiftKey">@drawable/sym_bkeyboard_shift</item>

        <item name="iconToSymbolKeyWithShortcut">@drawable/sym_bkeyboard_123_mic</item>

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

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

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

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

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

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

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

        <item name="iconNum1Key">@drawable/sym_bkeyboard_num1</item>

        <item name="iconNum2Key">@drawable/sym_bkeyboard_num2</item>

        <item name="iconNum3Key">@drawable/sym_bkeyboard_num3</item>

        <item name="iconNum4Key">@drawable/sym_bkeyboard_num4</item>

        <item name="iconNum5Key">@drawable/sym_bkeyboard_num5</item>

        <item name="iconNum6Key">@drawable/sym_bkeyboard_num6</item>

        <item name="iconNum7Key">@drawable/sym_bkeyboard_num7</item>

        <item name="iconNum8Key">@drawable/sym_bkeyboard_num8</item>

        <item name="iconNum9Key">@drawable/sym_bkeyboard_num9</item>

        <item name="iconNum0Key">@drawable/sym_bkeyboard_num0</item>

        <item name="iconNumStarKey">@drawable/sym_bkeyboard_numstar</item>

        <item name="iconNumPoundKey">@drawable/sym_bkeyboard_numpound</item>

        <item name="iconNumAltKey">@drawable/sym_bkeyboard_numalt</item>

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

        <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>

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

        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item>

        <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>

    </style>

</resources>

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <style name="KeyboardIcons.Holo" parent="android:Theme.Holo">

        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>

<!--         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic_holo</item> -->

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

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

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

        <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</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="iconNum1Key">@drawable/sym_keyboard_num1_holo</item>

        <item name="iconNum2Key">@drawable/sym_keyboard_num2_holo</item>

        <item name="iconNum3Key">@drawable/sym_keyboard_num3_holo</item>

        <item name="iconNum4Key">@drawable/sym_keyboard_num4_holo</item>

        <item name="iconNum5Key">@drawable/sym_keyboard_num5_holo</item>

        <item name="iconNum6Key">@drawable/sym_keyboard_num6_holo</item>

        <item name="iconNum7Key">@drawable/sym_keyboard_num7_holo</item>

        <item name="iconNum8Key">@drawable/sym_keyboard_num8_holo</item>

        <item name="iconNum9Key">@drawable/sym_keyboard_num9_holo</item>

        <item name="iconNum0Key">@drawable/sym_keyboard_num0_holo</item>

        <item name="iconNumStarKey">@drawable/sym_keyboard_numbstar_holo</item>

        <item name="iconNumPoundKey">@drawable/sym_keyboard_numbpound_holo</item>

<!--         <item name="iconNumAltKey">@drawable/sym_keyboard_numalt_holo</item> -->

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

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

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

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

<!--         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->

    </style>

</resources>

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <style name="KeyboardIcons" parent="android:Theme">

        <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>

        <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>

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

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

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

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

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

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

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

        <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>

        <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>

        <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>

        <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>

        <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>

        <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>

        <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>

        <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>

        <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>

        <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>

        <item name="iconNumStarKey">@drawable/sym_keyboard_numstar</item>

        <item name="iconNumPoundKey">@drawable/sym_keyboard_numpound</item>

        <item name="iconNumAltKey">@drawable/sym_keyboard_numalt</item>

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

        <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>

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

        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item>

        <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>

    </style>

</resources>

java/res/values/themes-basic-highcontrast.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

    <style name="KeyboardTheme.HighContrast" parent="KeyboardIcons">

        <item name="keyboardStyle">@style/Keyboard</item>

        <item name="latinKeyboardStyle">@style/LatinKeyboard</item>

        <item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item>

        <item name="keyPreviewStyle">@style/KeyPreviewStyle</item>

        <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView</item>

        <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle</item>

        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="candidateViewStyle">@style/CandidateViewStyle</item>

    </style>

</resources>