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

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

Merge "Separate functional key background from normal one"

parents dd6d96c2 c1e6100b

java/res/drawable/btn_keyboard_key_ics.xml

+0 −6
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
-->



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

    <item android:state_single="true"

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



    <!-- Action keys. -->

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

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

java/res/drawable/btn_keyboard_key_klp.xml

+0 −6
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
-->



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

    <item android:state_single="true"

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



    <!-- Action keys. -->

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

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

java/res/drawable/btn_keyboard_key_lmp.xml

+0 −6
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
-->



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

    <!-- Functional keys. -->

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

          android:drawable="@color/key_background_pressed_lmp" />

    <item android:state_single="true"

          android:drawable="@color/key_background_lmp" />



    <!-- Action keys. -->

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

          android:drawable="@color/key_background_pressed_lmp" />

java/res/values/attrs.xml

+8 −7
Original line number Diff line number Diff line
@@ -41,13 +41,16 @@ 
    </declare-styleable>



    <declare-styleable name="KeyboardView">

        <!-- Image for the key. This image needs to be a {@link StateListDrawable}, with the

             following possible states: normal, pressed, checkable, checkable+pressed,

        <!-- Background image for the key. This image needs to be a {@link StateListDrawable},

             with the following possible states: normal, pressed, checkable, checkable+pressed,

             checkable+checked, checkable+checked+pressed. -->

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

        <!-- Image for the functional key used in Emoji layout. -->

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



        <!-- Background image for the functional key. This image needs to be a

             {@link StateListDrawable}, with the following possible states: normal, pressed. -->

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

        <!-- Background image for the spacebar.  This image needs to be a

             {@link StateListDrawable}, with the following possible states: normal, pressed. -->

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

        <!-- Horizontal padding of left/right aligned key label to the edge of the key. -->

        <attr name="keyLabelHorizontalPadding" format="dimension" />

        <!-- Right padding of hint letter to the edge of the key.-->
@@ -76,8 +79,6 @@ 
        <attr name="languageOnSpacebarTextColor" format="color" />

        <attr name="languageOnSpacebarTextShadowRadius" format="float" />

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

        <!-- Background image for the spacebar. -->

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

        <!-- Fadeout animator for spacebar language label. -->

        <attr name="languageOnSpacebarFinalAlpha" format="integer" />

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

java/res/values/themes-common.xml

+1 −6
Original line number Diff line number Diff line
@@ -109,12 +109,7 @@ 
    <style name="KeyPreviewTextView" />

    <!-- Though {@link EmojiPalettesView} doesn't extend {@link KeyboardView}, some views inside it,

         for instance delete button, need themed {@link KeyboardView} attributes. -->

    <style

        name="EmojiPalettesView"

        parent="KeyboardView"

    >

        <item name="emojiTabLabelColor">@color/emoji_tab_label_color_holo</item>

    </style>

    <style name="EmojiPalettesView" />

    <style name="MoreKeysKeyboard" />

    <style

        name="MoreKeysKeyboardView"