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

Commit 2debf168 authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit '5df8b427' into HEAD

parents 5c36065b 5df8b427

java/res/color/emoji_tab_label_color_ics.xml→java/res/color/emoji_tab_label_color_holo.xml

+4 −4
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_focused="true"

        android:color="@color/key_text_color_ics" />

        android:color="@color/key_text_color_holo" />

    <item

        android:state_pressed="true"

        android:color="@color/key_text_color_ics" />

        android:color="@color/key_text_color_holo" />

    <item

        android:state_selected="true"

        android:color="@color/key_text_color_ics" />

        android:color="@color/key_text_color_holo" />

    <item

        android:color="@color/key_text_inactivated_color_ics" />

        android:color="@color/key_text_inactivated_color_holo" />

</selector>

java/res/color/key_text_color_ics.xml→java/res/color/key_text_color_holo.xml

+11 −11
Original line number Diff line number Diff line
@@ -17,32 +17,32 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Functional keys. -->

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

          android:color="@color/key_text_color_functional_ics" />

          android:color="@color/key_text_color_functional_holo" />

    <item android:state_single="true"

          android:color="@color/key_text_color_functional_ics" />

          android:color="@color/key_text_color_functional_holo" />



    <!-- Action keys. -->

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

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_active="true"

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />



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

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

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />

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

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />

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

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_checkable="true"

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />



    <!-- Empty background keys. -->

    <item android:state_empty="true"

          android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />



    <!-- Normal keys. -->

    <item android:state_pressed="true"

          android:color="@color/key_text_color_normal_ics" />

    <item android:color="@color/key_text_color_normal_ics" />

          android:color="@color/key_text_color_normal_holo" />

    <item android:color="@color/key_text_color_normal_holo" />

</selector>

java/res/drawable-hdpi/btn_keyboard_key_dark_active_ics.9.png

0 → 100644
+462 B
Loading image diff...

java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_ics.9.png

0 → 100644
+587 B
Loading image diff...