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

Commit d5e6044d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by The Android Automerger
Browse files

Rename KLP/JB/ICS common resource name suffixes to _holo 

Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
parent 978e2f67

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/values-land/dimens.xml

+6 −6
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
    <fraction name="key_bottom_gap_gb">5.941%p</fraction>

    <fraction name="key_horizontal_gap_gb">0.997%p</fraction>



    <fraction name="keyboard_top_padding_ics">2.727%p</fraction>

    <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>

    <fraction name="key_bottom_gap_ics">5.368%p</fraction>

    <fraction name="key_horizontal_gap_ics">1.020%p</fraction>

    <fraction name="keyboard_top_padding_holo">2.727%p</fraction>

    <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>

    <fraction name="key_bottom_gap_holo">5.368%p</fraction>

    <fraction name="key_horizontal_gap_holo">1.020%p</fraction>



    <!-- left or right padding of label alignment -->

    <dimen name="key_label_horizontal_padding">8dp</dimen>
@@ -54,9 +54,9 @@ 
    <fraction name="key_letter_ratio_5row">78%</fraction>

    <fraction name="key_uppercase_letter_ratio_5row">48%</fraction>



    <dimen name="key_preview_offset_ics">1.6dp</dimen>

    <dimen name="key_preview_offset_holo">1.6dp</dimen>

    <!-- popup_key_height x -0.5 -->

    <dimen name="more_keys_keyboard_vertical_correction_ics">-22.4dp</dimen>

    <dimen name="more_keys_keyboard_vertical_correction_holo">-22.4dp</dimen>



    <dimen name="suggestions_strip_height">36dp</dimen>

    <dimen name="more_suggestions_row_height">36dp</dimen>

java/res/values-sw540dp-land/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
    <fraction name="key_bottom_gap_gb">5.200%p</fraction>

    <fraction name="key_horizontal_gap_gb">1.447%p</fraction>



    <fraction name="keyboard_top_padding_ics">2.727%p</fraction>

    <fraction name="keyboard_bottom_padding_ics">0.0%p</fraction>

    <fraction name="key_bottom_gap_ics">4.5%p</fraction>

    <fraction name="key_horizontal_gap_ics">0.9%p</fraction>

    <fraction name="keyboard_top_padding_holo">2.727%p</fraction>

    <fraction name="keyboard_bottom_padding_holo">0.0%p</fraction>

    <fraction name="key_bottom_gap_holo">4.5%p</fraction>

    <fraction name="key_horizontal_gap_holo">0.9%p</fraction>



    <dimen name="popup_key_height">81.9dp</dimen>

java/res/values-sw540dp/dimens.xml

+6 −6
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
    <fraction name="key_bottom_gap_gb">4.625%p</fraction>

    <fraction name="key_horizontal_gap_gb">2.113%p</fraction>



    <fraction name="keyboard_top_padding_ics">2.335%p</fraction>

    <fraction name="keyboard_bottom_padding_ics">4.0%p</fraction>

    <fraction name="key_bottom_gap_ics">4.5%p</fraction>

    <fraction name="key_horizontal_gap_ics">1.565%p</fraction>

    <fraction name="keyboard_top_padding_holo">2.335%p</fraction>

    <fraction name="keyboard_bottom_padding_holo">4.0%p</fraction>

    <fraction name="key_bottom_gap_holo">4.5%p</fraction>

    <fraction name="key_horizontal_gap_holo">1.565%p</fraction>



    <dimen name="more_keys_keyboard_key_horizontal_padding">6dp</dimen>

    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
@@ -66,9 +66,9 @@ 
    <fraction name="key_letter_ratio_5row">52%</fraction>

    <fraction name="key_uppercase_letter_ratio_5row">27%</fraction>



    <dimen name="key_preview_offset_ics">8.0dp</dimen>

    <dimen name="key_preview_offset_holo">8.0dp</dimen>

    <!-- popup_key_height x -0.5 -->

    <dimen name="more_keys_keyboard_vertical_correction_ics">-31.5dp</dimen>

    <dimen name="more_keys_keyboard_vertical_correction_holo">-31.5dp</dimen>



    <dimen name="suggestions_strip_height">44dp</dimen>

    <dimen name="more_suggestions_row_height">44dp</dimen>