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

Commit 9f5f0ee9 authored by Timi Rautamäki's avatar Timi Rautamäki
Browse files

Dialer: set statusbar color same as activity background 

 * Keep styles that use actionBar as is because it uses
   normal actionbar
 * Set light statusbar attribute for some styles

Change-Id: I8748aa4d12f8e0c68d14d514ea5a2bd4100ee3ca
parent d50c89c7

java/com/android/dialer/main/impl/res/values-night/styles.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2017 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>



  <style name="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">

    <item name="android:colorPrimary">@color/dialer_theme_color</item>

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

    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <item name="android:windowLightStatusBar">false</item>

  </style>



</resources>

java/com/android/dialer/main/impl/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <item name="colorPrimary">@color/dialer_theme_color</item>

    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>

    <item name="android:windowLightStatusBar">true</item>

  </style>



  <!-- Activities should use this theme as their style -->

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <item name="actionBarTheme">@style/DialerActionBarBaseTheme</item>

    <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>



    <item name="android:colorPrimaryDark">@color/settings_primary_dark</item>

    <item name="colorControlHighlight">@color/dialer_ripple_color</item>

  </style>

java/com/android/dialer/theme/common/res/values-night/colors.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2012 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

  -->

<!-- The colors in this file aren't configured at the theme level. -->

<resources>

  <!-- Settings -->

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

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  <!-- Essential theme colors -->

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

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

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

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

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

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

</resources>