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

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

Move spacebar drawing code from LatinKeyboard to LatinKeyboardView 

Also this change moves LatinKeyboard attributes,
autoCorrectionSpacebarLedEnabled, autoCorrectionSpacebarLedIcon,
spacebarTextRatio, spacebarTextColor, and spacebarTextShadowColor to
LatinKeyboardView.

Change-Id: I7cc27ce1fc550e9f620a9ed0fbe4b8172902d5a1
parent 7bd714c0

java/res/values/attrs.xml

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



    <declare-styleable name="LatinKeyboardView">

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

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

        <!-- Size of the text for spacebar language label, in the proportion of key height. -->

        <attr name="spacebarTextRatio" format="fraction" />

        <attr name="spacebarTextColor" format="color" />

        <attr name="spacebarTextShadowColor" format="color" />

    </declare-styleable>



    <declare-styleable name="SuggestionsView">
@@ -327,16 +333,6 @@ 
        <attr name="parentStyle" format="string" />

    </declare-styleable>



    <!-- TODO: Move these attributes to LatinKeyboardView -->

    <declare-styleable name="LatinKeyboard">

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

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

        <!-- Size of the text for spacebar language label, in the proportion of key height. -->

        <attr name="spacebarTextRatio" format="fraction" />

        <attr name="spacebarTextColor" format="color" />

        <attr name="spacebarTextShadowColor" format="color" />

    </declare-styleable>



    <declare-styleable name="KeyboardSet">

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

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

java/res/values/styles.xml

+30 −21
Original line number Diff line number Diff line
@@ -31,13 +31,6 @@ 
        <item name="verticalGap">@fraction/key_bottom_gap</item>

        <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>

    </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>

    </style>

    <style name="KeyboardView">

        <item name="android:background">@drawable/keyboard_background</item>

        <item name="keyBackground">@drawable/btn_keyboard_key</item>
@@ -75,6 +68,11 @@ 
    <style

        name="LatinKeyboardView"

        parent="KeyboardView">

        <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>

    </style>

    <style

        name="MiniKeyboard"
@@ -143,6 +141,11 @@ 
        name="LatinKeyboardView.HighContrast"

        parent="KeyboardView.HighContrast"

    >

        <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>

    </style>

    <!-- Theme "Stone" -->

    <style
@@ -156,13 +159,6 @@ 
        <item name="horizontalGap">@fraction/key_horizontal_gap_stone</item>

        <item name="verticalGap">@fraction/key_bottom_gap_stone</item>

    </style>

    <style

        name="LatinKeyboard.Stone"

        parent="LatinKeyboard"

    >

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

        <item name="spacebarTextShadowColor">#D0FFFFFF</item>

    </style>

    <style

        name="KeyboardView.Stone"

        parent="KeyboardView"
@@ -180,6 +176,11 @@ 
        name="LatinKeyboardView.Stone"

        parent="KeyboardView.Stone"

    >

        <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">#FF000000</item>

        <item name="spacebarTextShadowColor">#D0FFFFFF</item>

    </style>

    <style

        name="MiniKeyboard.Stone"
@@ -214,6 +215,11 @@ 
        name="LatinKeyboardView.Stone.Bold"

        parent="KeyboardView.Stone.Bold"

    >

        <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">#FF000000</item>

        <item name="spacebarTextShadowColor">#D0FFFFFF</item>

    </style>

    <!-- Theme "Gingerbread" -->

    <style
@@ -237,6 +243,11 @@ 
        name="LatinKeyboardView.Gingerbread"

        parent="KeyboardView.Gingerbread"

    >

        <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>

    </style>

    <style

        name="MiniKeyboard.Gingerbread"
@@ -264,13 +275,6 @@ 
        <item name="verticalGap">@fraction/key_bottom_gap_ics</item>

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_ice_cream_sandwich</item>

    </style>

    <style

        name="LatinKeyboard.IceCreamSandwich"

        parent="LatinKeyboard"

    >

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

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

    </style>

    <style

        name="KeyboardView.IceCreamSandwich"

        parent="KeyboardView"
@@ -298,6 +302,11 @@ 
        name="LatinKeyboardView.IceCreamSandwich"

        parent="KeyboardView.IceCreamSandwich"

    >

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

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

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

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

        <item name="spacebarTextShadowColor">#80000000</item>

        </style>

    <style

        name="MiniKeyboard.IceCreamSandwich"

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

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<resources>

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

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

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

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

        <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.HighContrast</item>

        <item name="miniKeyboardStyle">@style/MiniKeyboard</item>

java/res/values/themes-basic.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<resources>

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

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

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

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

        <item name="latinKeyboardViewStyle">@style/LatinKeyboardView</item>

        <item name="miniKeyboardStyle">@style/MiniKeyboard</item>

java/res/values/themes-gingerbread.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<resources>

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

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

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

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

        <item name="latinKeyboardViewStyle">@style/LatinKeyboardView.Gingerbread</item>

        <item name="miniKeyboardStyle">@style/MiniKeyboard.Gingerbread</item>