From 063171599f349c0c254a9be7a92074390ed103e4 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Tue, 10 Jul 2018 18:37:54 +0000
Subject: Revert "Update style for important call badge."

This reverts commit 79a9ae7be17c7fe50e6812a47cdd6e7ce5d07966.

Change-Id: Ib60e15fba40207884cb2f9d4f0e65fd599b33ae5
---
 java/com/android/dialer/theme/common/res/values/text_styles.xml  | 2 +-
 .../incallui/answer/impl/res/drawable/urgent_call_background.xml | 2 +-
 .../incallui/answer/impl/res/layout/fragment_incoming_call.xml   | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml
index 0d1fd850e..def5862d4 100644
--- a/java/com/android/dialer/theme/common/res/values/text_styles.xml
+++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml
@@ -33,7 +33,7 @@
 
   <style name="Dialer.TextAppearance.SubHeader" parent="TextAppearance.AppCompat">
     <item name="android:textColor">?android:attr/textColorPrimary</item>
-    <item name="android:textSize">14sp</item>
+    <item name="android:textSize">16sp</item>
     <item name="android:fontFamily">sans-serif-medium</item>
   </style>
 
diff --git a/java/com/android/incallui/answer/impl/res/drawable/urgent_call_background.xml b/java/com/android/incallui/answer/impl/res/drawable/urgent_call_background.xml
index 769529025..d995980c6 100644
--- a/java/com/android/incallui/answer/impl/res/drawable/urgent_call_background.xml
+++ b/java/com/android/incallui/answer/impl/res/drawable/urgent_call_background.xml
@@ -18,5 +18,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="24dp"/>
-  <solid android:color="?android:attr/colorPrimary"/>
+  <solid android:color="#F50057"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
index 3a68bd4f6..1672bf984 100644
--- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
@@ -121,16 +121,19 @@
       <!-- TODO(a bug): textColorPrimary or textColorPrimaryInverse? -->
       <TextView
           android:id="@+id/incall_important_call_badge"
+          android:textStyle="bold"
           android:layout_width="wrap_content"
-          android:layout_height="32dp"
+          android:layout_height="48dp"
           android:layout_marginTop="4dp"
           android:layout_marginBottom="@dimen/answer_importance_margin_bottom"
           android:background="@drawable/urgent_call_background"
+          android:elevation="@dimen/answer_data_elevation"
           android:gravity="center"
           android:maxLines="1"
           android:text="@string/call_incoming_important"
-          style="@style/Dialer.TextAppearance.SubHeader"
-          android:textColor="?android:attr/colorBackground"/>
+          android:textAllCaps="true"
+          android:textColor="?android:attr/colorBackground"
+          android:textSize="14sp"/>
 
       <FrameLayout
           android:id="@+id/incall_location_holder"
-- 
cgit v1.2.3