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

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

Add LatinKeyboardView style 

As a result, this change moves shortcut related update code to
LatinKeyboardView from LatinKeyboard.

Change-Id: I1882672577f61e73c90d6c018b7dbb61f3fe21e4
parent 22b48de1

java/res/values/attrs.xml

+8 −2
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ 
    <declare-styleable name="KeyboardTheme">

        <!-- Keyboard style -->

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

        <!-- TODO: Get rid of latinKeyboardStyle -->

        <!-- LatinKeyboard style -->

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

        <!-- KeyboardView style -->

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

        <!-- LatinKeyboardView style -->

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

        <!-- MiniKeyboard style -->

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

        <!-- MiniKeyboardView style -->
@@ -120,6 +123,10 @@ 
        </attr>

    </declare-styleable>



    <declare-styleable name="LatinKeyboardView">

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

    </declare-styleable>



    <declare-styleable name="SuggestionsView">

        <attr name="suggestionStripOption" format="integer">

            <!-- This should be aligned with SuggestionsViewParams.AUTO_CORRECT_* and etc. -->
@@ -321,11 +328,10 @@ 
        <attr name="parentStyle" format="string" />

    </declare-styleable>



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

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

    <declare-styleable name="LatinKeyboard">

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

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

        <attr name="disabledShortcutIcon" 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" />

java/res/values/styles.xml

+38 −1
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ 
        <item name="shadowRadius">2.75</item>

        <item name="backgroundDimAmount">0.5</item>

    </style>

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

        parent="Keyboard"
@@ -134,6 +140,13 @@ 
        <item name="android:background">@android:color/black</item>

        <item name="keyBackground">@drawable/btn_keyboard_key3</item>

    </style>

    <style

        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

        name="Keyboard.Stone"
@@ -166,6 +179,12 @@ 
        <item name="keyUppercaseLetterActivatedColor">#CC000000</item>

        <item name="shadowColor">#FFFFFFFF</item>

    </style>

    <style

        name="LatinKeyboardView.Stone"

        parent="KeyboardView.Stone"

    >

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

    </style>

    <style

        name="MiniKeyboard.Stone"

        parent="Keyboard.Stone"
@@ -195,6 +214,12 @@ 
    >

        <item name="keyTextStyle">bold</item>

    </style>

    <style

        name="LatinKeyboardView.Stone.Bold"

        parent="KeyboardView.Stone.Bold"

    >

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

    </style>

    <!-- Theme "Gingerbread" -->

    <style

        name="Keyboard.Gingerbread"
@@ -213,6 +238,13 @@ 
        <item name="keyBackground">@drawable/btn_keyboard_key_gingerbread</item>

        <item name="keyTextStyle">bold</item>

    </style>

    <style

        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"

        parent="Keyboard.Gingerbread"
@@ -244,7 +276,6 @@ 
        parent="LatinKeyboard"

    >

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

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

    </style>

    <style

        name="KeyboardView.IceCreamSandwich"
@@ -269,6 +300,12 @@ 
        <item name="shadowColor">#00000000</item>

        <item name="shadowRadius">0.0</item>

    </style>

    <style

        name="LatinKeyboardView.IceCreamSandwich"

        parent="KeyboardView.IceCreamSandwich"

    >

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

        </style>

    <style

        name="MiniKeyboard.IceCreamSandwich"

        parent="Keyboard.IceCreamSandwich"

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
        <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>

        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>

java/res/values/themes-basic.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
        <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>

        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>

java/res/values/themes-gingerbread.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
        <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>

        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>