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

Commit 0eaedafc authored by =?UTF-8?q?Timi=20Rautam=C3=A4ki?='s avatar =?UTF-8?q?Timi=20Rautam=C3=A4ki?= Committed by Michael W
Browse files

Dialer: Use Material You colors 

Change-Id: Ie8d454d6cec52b96e17a201776042be500d810bd
parent 1e323361

java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
    <item name="android:textColorSecondary">@color/settings_text_color_secondary</item>

    <item name="android:windowBackground">?android:attr/colorBackground</item>

    <item name="android:colorAccent">?android:attr/colorPrimary</item>

    <item name="colorPrimary">@color/settings_primary</item>

  </style>



  <!-- TODO(a bug): This is only actively used in empty_content_view.xml. Move it there. -->

java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
    <item name="android:forceDarkAllowed">true</item>

    <!-- These values should be used to color all backgrounds. -->

    <item name="android:colorBackground">@color/dialer_background_color</item>

    <item name="android:colorBackgroundFloating">@android:color/white</item>

    <item name="android:colorBackgroundFloating">@color/dialer_background_floating</item>

    <item name="colorBackgroundSearchBar">@color/dialer_search_bar_color</item>



    <!-- These values should be used to set text color. -->

java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<resources>

  <!-- Essential theme colors -->

  <color name="dialer_theme_color">#5195EA</color>

  <color name="dialer_theme_color_20pct">#335195EA</color>

  <color name="dialer_secondary_color">#5195EA</color>

  <color name="dialer_ripple_color">#33ffffff</color>

  <color name="dialer_search_bar_color">@color/google_grey_900</color>

  <color name="settings_primary_dark">#2374CE</color>

</resources>

java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml

+7 −5
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ 
  -->

<resources>

  <!-- Essential theme colors -->

  <color name="dialer_theme_color">#2A56C6</color>

  <color name="dialer_theme_color">@android:color/system_accent1_400</color>

  <color name="dialer_theme_color_20pct">#332A56C6</color>

  <color name="dialer_theme_color_dark">@color/dialer_background_color</color>

  <color name="dialer_secondary_color">#F50057</color>

  <color name="dialer_background_color">#FAFAFA</color>

  <color name="dialer_secondary_color">@android:color/system_accent3_400</color>

  <color name="dialer_background_color">@android:color/system_neutral1_50</color>

  <color name="dialer_background_floating">@android:color/system_neutral1_100</color>

  <color name="dialer_ripple_color">#1f000000</color>

  <color name="dialer_search_bar_color">@color/google_grey_50</color>

  <color name="settings_primary_dark">#1C3AA9</color>

  <color name="dialer_search_bar_color">@android:color/system_neutral2_100</color>

  <color name="settings_primary_dark">@android:color/system_accent2_200</color>

  <color name="settings_primary">@color/settings_primary_dark</color>

</resources>