summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-06-22 17:12:17 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-26 13:40:44 -0700
commit79a9ae7be17c7fe50e6812a47cdd6e7ce5d07966 (patch)
treefbb09af710e5493dae0a071a161965221248d99f /java
parent4af5facf5a45bb06beebdba790af2807c39e7649 (diff)
Update style for important call badge.
Bug: 79878432 Test: manual PiperOrigin-RevId: 201764305 Change-Id: I09d0df697c4eb93a732053280fe4b79513ebfe75
Diffstat (limited to 'java')
-rw-r--r--java/com/android/dialer/theme/common/res/values/text_styles.xml2
-rw-r--r--java/com/android/incallui/answer/impl/res/drawable/urgent_call_background.xml2
-rw-r--r--java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml9
3 files changed, 5 insertions, 8 deletions
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 def5862d4..0d1fd850e 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">16sp</item>
+ <item name="android:textSize">14sp</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 d995980c6..769529025 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="#F50057"/>
+ <solid android:color="?android:attr/colorPrimary"/>
</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 1672bf984..3a68bd4f6 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,19 +121,16 @@
<!-- 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="48dp"
+ android:layout_height="32dp"
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"
- android:textAllCaps="true"
- android:textColor="?android:attr/colorBackground"
- android:textSize="14sp"/>
+ style="@style/Dialer.TextAppearance.SubHeader"
+ android:textColor="?android:attr/colorBackground"/>
<FrameLayout
android:id="@+id/incall_location_holder"