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

Commit 21915c4c authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 3de1aca2: Merge "Update resources: Colors" 

* commit '3de1aca2':
  Update resources: Colors
parents 702bd17d 3de1aca2

java/res/values/colors.xml

+6 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <color name="spacebar_text_color_gb">#FFC0C0C0</color>

    <color name="spacebar_text_shadow_color_gb">#80000000</color>

    <color name="gesture_floating_preview_color_gb">#C0000000</color>

    <!-- Color resources for IceCreamSandwich theme. -->

    <!-- Color resources for IceCreamSandwich theme. Base color = 33B5E5 -->

    <!-- android:color/holo_blue_light value is #FF33B5E5 -->

    <color name="highlight_color_ics">#FF33B5E5</color>

    <color name="typed_word_color_ics">#D833B5E5</color>
@@ -49,6 +49,11 @@ 
    <color name="spacebar_text_color_ics">#FFC0C0C0</color>

    <color name="spacebar_text_shadow_color_ics">#80000000</color>

    <color name="gesture_floating_preview_color_ics">#C0000000</color>

    <!-- Color resources for KLP theme. Base color = F0F0F0 -->

    <color name="highlight_color_holo">#FFF0F0F0</color>

    <color name="typed_word_color_holo">#D8F0F0F0</color>

    <color name="suggested_word_color_holo">#B2F0F0F0</color>

    <color name="highlight_translucent_color_holo">#99E0E0E0</color>

    <!-- Color resources for setup wizard and tutorial -->

    <color name="setup_background">#FFEBEBEB</color>

    <color name="setup_text_dark">#FF707070</color>

java/res/values/themes-ics.xml

+7 −7
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ 
    >

        <item name="keyPreviewLayout">@layout/key_preview_ics</item>

        <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>

        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item>

        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo</item>

        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_ics</item>

        <item name="gestureTrailColor">@color/highlight_color_ics</item>

        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item>

        <item name="gestureTrailColor">@color/highlight_color_holo</item>

        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo</item>

        <item name="autoCorrectionSpacebarLedEnabled">false</item>

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>

        <item name="spacebarTextColor">@color/spacebar_text_color_ics</item>
@@ -135,10 +135,10 @@ 
    >

        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>

        <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>

        <item name="colorValidTypedWord">@color/typed_word_color_ics</item>

        <item name="colorTypedWord">@color/typed_word_color_ics</item>

        <item name="colorAutoCorrect">@color/highlight_color_ics</item>

        <item name="colorSuggested">@color/suggested_word_color_ics</item>

        <item name="colorValidTypedWord">@color/typed_word_color_holo</item>

        <item name="colorTypedWord">@color/typed_word_color_holo</item>

        <item name="colorAutoCorrect">@color/highlight_color_holo</item>

        <item name="colorSuggested">@color/suggested_word_color_holo</item>

        <item name="alphaObsoleted">70%</item>

    </style>

    <style name="SuggestionWord.ICS">