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

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

Merge "Add empty key background type"

parents ed5582ec e18439d5

java/res/drawable/btn_keyboard_key.xml

+5 −6
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
-->



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



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



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

          android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_pressed_on" />
@@ -28,11 +26,12 @@ 
    <item android:state_checkable="true"

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



    <!-- Normal keys -->

    <!-- Empty background keys. -->

    <item android:state_empty="true"

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



    <!-- Normal keys. -->

    <item android:state_pressed="true"

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

    <item

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



    <item android:drawable="@drawable/btn_keyboard_key_normal" />

</selector>

java/res/drawable/btn_keyboard_key3.xml

+4 −3
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
-->



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



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



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

          android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_pressed_on" />
@@ -28,8 +26,11 @@ 
    <item android:state_checkable="true"

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



    <!-- Normal keys -->

    <!-- Empty background keys. -->

    <item android:state_empty="true"

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



    <!-- Normal keys. -->

    <item android:state_pressed="true"

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

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

java/res/drawable/btn_keyboard_key_gingerbread.xml

+4 −5
Original line number Diff line number Diff line
@@ -15,23 +15,19 @@ 
-->



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

    <item android:state_single="true"

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



    <!-- Action keys. -->



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

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

    <item android:state_active="true"

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



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



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

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

    <item android:state_checkable="true" android:state_pressed="true"
@@ -41,8 +37,11 @@ 
    <item android:state_checkable="true"

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



    <!-- Normal keys. -->

    <!-- Empty background keys. -->

    <item android:state_empty="true"

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



    <!-- Normal keys. -->

    <item android:state_pressed="true"

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

    <item android:drawable="@drawable/btn_keyboard_key_light_normal" />

java/res/drawable/btn_keyboard_key_ics.xml

+4 −5
Original line number Diff line number Diff line
@@ -15,23 +15,19 @@ 
-->



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

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

    <item android:state_active="true"

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



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



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

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

    <item android:state_checkable="true" android:state_pressed="true"
@@ -41,8 +37,11 @@ 
    <item android:state_checkable="true"

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



    <!-- Normal keys. -->

    <!-- Empty background keys. -->

    <item android:state_empty="true"

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



    <!-- Normal keys. -->

    <item android:state_pressed="true"

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

    <item android:drawable="@drawable/btn_keyboard_key_light_normal_holo" />

java/res/drawable/btn_keyboard_key_stone.xml

+4 −5
Original line number Diff line number Diff line
@@ -15,23 +15,19 @@ 
-->



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



    <!-- Action keys. -->



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

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

    <item android:state_active="true"

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



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



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

          android:state_pressed="true"

          android:drawable="@drawable/btn_keyboard_key_normal_on_stone" />
@@ -42,8 +38,11 @@ 
    <item android:state_checkable="true"

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



    <!-- Normal keys. -->

    <!-- Empty background keys. -->

    <item android:state_empty="true"

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



    <!-- Normal keys. -->

    <item android:state_pressed="true"

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

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