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

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

Remove colorScheme attribute from KeyboardView 

Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
parent b947c73d

java/res/drawable/btn_keyboard_key_stone.xml

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 


<selector xmlns:android="http://schemas.android.com/apk/res/android">



    <!-- Functional keys. -->



    <item android:state_single="true" android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />

    <item android:state_single="true"

          android:drawable="@drawable/btn_keyboard_key_normal_stone" />



    <!-- Toggle keys. Use checkable/checked state. -->



    <item android:state_checkable="true" android:state_checked="true"

java/res/values/attrs.xml

+0 −7
Original line number Diff line number Diff line
@@ -90,13 +90,6 @@ 
            <enum name="italic" value="2" />

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

        </attr>



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

            <!-- This should be aligned with KeyboardView.COLOR_SCHEME_* -->

            <enum name="white" value="0" />

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

        </attr>



    </declare-styleable>



    <declare-styleable name="CandidateView">

java/res/values/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
        <item name="shadowColor">#BB000000</item>

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

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

        <item name="colorScheme">white</item>

    </style>

    <style name="KeyPreviewStyle">

        <item name="android:background">@drawable/keyboard_key_feedback</item>
@@ -107,7 +106,6 @@ 
        <item name="keyTextColor">@color/latinkeyboard_key_color_black</item>

        <item name="keyTextInactivatedColor">#FF808080</item>

        <item name="shadowColor">@color/latinkeyboard_key_color_white</item>

        <item name="colorScheme">black</item>

    </style>

    <style name="PopupMiniKeyboardView.Stone" parent="PopupMiniKeyboardView">

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

java/res/xml-sw600dp/kbd_key_styles.xml

+3 −15
Original line number Diff line number Diff line
@@ -22,21 +22,9 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <!-- Base key style for the functional key -->

    <switch>

        <case

            latin:colorScheme="white"

        >

    <key-style

        latin:styleName="functionalKeyStyle"

        latin:isFunctional="true" />

        </case>

        <case

            latin:colorScheme="black"

        >

            <key-style

                latin:styleName="functionalKeyStyle" />

        </case>

    </switch>

    <!-- Functional key styles -->

    <key-style

        latin:styleName="shiftKeyStyle"

java/res/xml-sw768dp/kbd_key_styles.xml

+3 −15
Original line number Diff line number Diff line
@@ -22,21 +22,9 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <!-- Functional key styles -->

    <switch>

        <case

            latin:colorScheme="white"

        >

    <key-style

        latin:styleName="functionalKeyStyle"

        latin:isFunctional="true" />

        </case>

        <case

            latin:colorScheme="black"

        >

            <key-style

                latin:styleName="functionalKeyStyle" />

        </case>

    </switch>

    <key-style

        latin:styleName="shiftKeyStyle"

        latin:code="@integer/key_shift"