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

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

Merge "Add dedicated background for custom action label key" into lmp-dev

parents 93daa04d 017e9f7e

java/res/drawable/btn_keyboard_key_lxx_dark.xml

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



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

    <!-- Custom label action keys. -->

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

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

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

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

    <!-- Action keys. -->

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

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

java/res/drawable/btn_keyboard_key_lxx_light.xml

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



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

    <!-- Custom label action keys. -->

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

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

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

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

    <!-- Action keys. -->

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

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

java/res/values/attrs.xml

+4 −3
Original line number Diff line number Diff line
@@ -270,9 +270,10 @@ 
            <enum name="empty" value="0" />

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

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

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

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

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

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

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

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

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

        </attr>

        <!-- The key action flags. -->

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

java/res/xml-sw600dp/key_styles_enter.xml

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ 
                latin:styleName="enterKeyStyle"

                latin:keySpec="dummy_label|!code/key_enter"

                latin:keyLabelFlags="fromCustomActionLabel"

                latin:backgroundType="customAction"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <!-- imeAction is either actionNone or actionUnspecified. -->

java/res/xml/key_styles_enter.xml

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ 
                latin:styleName="enterKeyStyle"

                latin:keySpec="dummy_label|!code/key_enter"

                latin:keyLabelFlags="fromCustomActionLabel"

                latin:backgroundType="customAction"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <!-- imeAction is either actionNone or actionUnspecified. -->