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

Commit 52a9f768 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'pie_theme_update' into 'v1-pie' 

Change app theme according to system accent color

See merge request e/os/android_packages_apps_Dialer!21
parents 8ed10dad acf920f1

java/com/android/dialer/app/res/layout/dialtacts_activity.xml

+45 −46
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
@@ -13,8 +12,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<android.support.design.widget.CoordinatorLayout

  xmlns:android="http://schemas.android.com/apk/res/android"

<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/dialtacts_mainlayout"

    android:layout_width="match_parent"
@@ -47,14 +45,15 @@ 
        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"

        android:contentDescription="@string/action_menu_dialpad_button"

        android:src="@drawable/quantum_ic_dialpad_white_24"

      app:elevation="@dimen/floating_action_button_translation_z"

      app:backgroundTint="@color/dialer_secondary_color"/>

        app:backgroundTint="@color/dialtacts_theme_color"

        app:elevation="@dimen/floating_action_button_translation_z" />



    <!-- Host container for the contact tile drag shadow -->

    <FrameLayout

        android:id="@+id/activity_overlay"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <ImageView

            android:id="@+id/contact_tile_drag_shadow_overlay"

            android:layout_width="wrap_content"

java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
      android:contentDescription="@string/description_dial_button"

      android:src="@drawable/quantum_ic_call_vd_theme_24"

      android:tint="#ffffff"

      app:backgroundTint="@color/dialpad_fab_green"

      app:backgroundTint="@color/dialtacts_theme_color"

      app:colorControlNormal="#ffffff"

      app:elevation="@dimen/floating_action_button_translation_z"/>

</view>

java/com/android/dialer/theme/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
         - Local: dialer_theme_color         Android Source: theme_color

         - Local: dialer_theme_color_dark    Android Source: dialer_settings_color_dark

       -->

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

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

  <color name="dialer_theme_color">@*android:color/accent_device_default_dark</color>

  <color name="dialer_theme_color_dark">@*android:color/accent_device_default_dark</color>



  <color name="dialer_snackbar_action_text_color">#4285F4</color>

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