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

Commit b6c615db authored by wangqi's avatar wangqi Committed by Eric Erfanian
Browse files

UI refresh for voice call screen. 

Bug: 79878432
Test: screen diff tests
PiperOrigin-RevId: 201758864
Change-Id: Ib3ed6636df3d337cb2fa7c5f6d8f24da035cbd0c
parent 8ea0035f

java/com/android/dialer/theme/base/Theme.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.dialer.theme.base;



import android.content.Context;

import android.content.res.ColorStateList;

import android.support.annotation.ColorInt;

import android.support.annotation.IntDef;

import android.support.annotation.StyleRes;
@@ -50,6 +51,8 @@ public interface Theme { 
  @ColorInt

  int getColorIcon();



  ColorStateList getColorIconStateList();



  @ColorInt

  int getColorIconSecondary();

java/com/android/dialer/theme/base/impl/AospThemeImpl.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.dialer.theme.base.impl;



import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.TypedArray;

import android.support.annotation.ColorInt;

import android.support.annotation.StyleRes;
@@ -33,6 +34,7 @@ import javax.inject.Singleton; 
public class AospThemeImpl implements Theme {



  private int colorIcon = -1;

  private final ColorStateList colorIconStateList;

  private int colorIconSecondary = -1;

  private int colorPrimary = -1;

  private int colorPrimaryDark = -1;
@@ -80,6 +82,7 @@ public class AospThemeImpl implements Theme { 
    colorBackground = array.getColor(/* index= */ 7, /* defValue= */ -1);

    colorBackgroundFloating = array.getColor(/* index= */ 8, /* defValue= */ -1);

    colorIcon = array.getColor(/* index= */ 9, /* defValue= */ -1);

    colorIconStateList = array.getColorStateList(/* index= */ 9);

    colorIconSecondary = array.getColor(/* index= */ 10, /* defValue= */ -1);

    colorTextOnUnthemedDarkBackground = array.getColor(/* index= */ 11, /* defValue= */ -1);

    colorIconOnUnthemedDarkBackground = array.getColor(/* index= */ 12, /* defValue= */ -1);
@@ -125,6 +128,12 @@ public class AospThemeImpl implements Theme { 
    return colorIcon;

  }



  @Override

  public ColorStateList getColorIconStateList() {

    Assert.checkArgument(colorIconStateList != null);

    return colorIconStateList;

  }



  @Override

  public @ColorInt int getColorIconSecondary() {

    Assert.checkArgument(colorIconSecondary != -1);

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
    <item name="colorControlActivated">?android:attr/colorPrimary</item>



    <!-- Dialer specific attributes. -->

    <item name="colorIcon">@color/google_grey_400</item>

    <item name="colorIcon">?android:attr/textColorSecondary</item>

    <item name="colorIconSecondary">?android:attr/textColorSecondary</item>

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
  <!-- Activities and Applications should inherit from one of the themes above. -->

  <style name="Dialer.ThemeBase">

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

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

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

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



    <!-- These values should be used to set text color. -->
@@ -61,7 +61,7 @@ 
    <item name="colorControlActivated">?android:attr/colorPrimary</item>



    <!-- Dialer specific attributes. -->

    <item name="colorIcon">@color/google_grey_700</item>

    <item name="colorIcon">@color/dialer_icon_color</item>

    <item name="colorIconSecondary">@color/google_grey_400</item>

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<!-- The colors in this file aren't configured at the theme level. -->

<resources>

  <color name="dialer_call_green">#34A853</color>

  <color name="dialer_end_call_button_color">#BD2A2A</color>

  <color name="dialer_end_call_button_color">#D93025</color>

  <color name="dialer_divider_line_color">#D8D8D8</color>

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

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