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

Commit 73d24924 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Update colors in Dialer for GAR requirements" into lmp-dev

parents c32c359a 3cd4d875
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
    android:gravity="center"
    android:fontFamily="@string/view_full_call_history_font_family"
    android:textStyle="bold"
    android:textColor="@color/view_full_call_history_color"
    android:textColor="@color/dialtacts_secondary_text_color"
    android:textSize="14sp"
    android:text="@string/recents_footer_text"
    android:background="@drawable/recent_lists_footer_background" />
+3 −6
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@

<resources>
    <!--  Primary text color in the Dialer -->
    <color name="dialtacts_primary_text_color">#333</color>
    <color name="dialtacts_primary_text_color">#333333</color>
    <!-- Secondary text color in the Dialer -->
    <color name="dialtacts_secondary_text_color">#737373</color>
    <color name="dialer_red_highlight_color">#ff1744</color>
    <color name="dialer_green_highlight_color">#00c853</color>

    <!-- Color for the setting text. -->
    <color name="setting_primary_color">#4d4c4c</color>
    <color name="setting_primary_color">@color/dialtacts_primary_text_color</color>
    <!-- Color for the setting description text. -->
    <color name="setting_secondary_color">#989898</color>
    <color name="setting_secondary_color">@color/dialtacts_secondary_text_color</color>
    <color name="setting_background_color">#ffffff</color>

    <!-- Color of the text describing an unconsumed missed call. -->
@@ -87,9 +87,6 @@
         as call back, play voicemail, etc. -->
    <color name="call_log_action_text">@color/dialer_theme_color</color>

    <!-- Color of view full call history item text. -->
    <color name="view_full_call_history_color">@color/dialer_theme_color</color>

    <!-- Color for missed call icons. -->
    <color name="missed_call">#ff2e58</color>

+2 −2
Original line number Diff line number Diff line
@@ -164,9 +164,9 @@
    <!-- Style applied to the "Settings" screen.  Keep in sync with SettingsLight in Telephony. -->
    <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay">
        <!-- Setting text. -->
        <item name="android:textColorSecondary">@color/setting_primary_color</item>
        <item name="android:textColor">@color/setting_primary_color</item>
        <!-- Setting description. -->
        <item name="android:textColorTertiary">@color/setting_secondary_color</item>
        <item name="android:textColorSecondary">@color/setting_secondary_color</item>
        <item name="android:windowBackground">@color/setting_background_color</item>
        <item name="android:colorAccent">@color/dialtacts_theme_color</item>
        <item name="android:textColorLink">@color/dialtacts_theme_color</item>