summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/commontheme
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2018-07-10 18:37:03 +0000
committerEric Erfanian <erfanian@google.com>2018-07-10 18:57:16 +0000
commit4ca9e8da3d5c1469e9b203874c9c4e7d4db3eb92 (patch)
tree60e6eaeb91e67bc404a39b8353538347efc72a3e /java/com/android/incallui/commontheme
parent3fb83d37061d26cf48ca41d83f889e4afb7c9699 (diff)
Revert "UI refresh for ringing screen."
This reverts commit 36d5b93da4f93e50deb496daa5ad820c48aa7b01. Change-Id: I533bc3f7d592a6e257d184f0d3730b4be95f2af2
Diffstat (limited to 'java/com/android/incallui/commontheme')
-rw-r--r--java/com/android/incallui/commontheme/res/values/styles.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/java/com/android/incallui/commontheme/res/values/styles.xml b/java/com/android/incallui/commontheme/res/values/styles.xml
index f2ec2ccc3..464eda5bb 100644
--- a/java/com/android/incallui/commontheme/res/values/styles.xml
+++ b/java/com/android/incallui/commontheme/res/values/styles.xml
@@ -17,12 +17,15 @@
<resources>
- <style name="Dialer.Incall.TextAppearance" parent="Dialer.TextAppearance.Header1">
+ <style name="Dialer.Incall.TextAppearance" parent="android:TextAppearance.Material">
<item name="android:textColor">?android:attr/textColorSecondary</item>
+ <item name="android:textSize">18sp</item>
</style>
- <style name="Dialer.Incall.TextAppearance.Large" parent="Dialer.TextAppearance.Header1">
+ <style name="Dialer.Incall.TextAppearance.Large">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">36sp</item>
+ <item name="android:fontFamily">sans-serif-light</item>
</style>
<style name="Dialer.Incall.TextAppearance.Label">
@@ -30,18 +33,12 @@
<item name="android:textSize">12sp</item>
</style>
- <style name="Dialer.Incall.TextAppearance.Hint">
- <item name="android:textColor">?android:attr/textColorHint</item>
- <item name="android:textSize">14sp</item>
- <item name="android:textStyle">italic</item>
- </style>
-
<style name="BottomRowIcon">
<item name="android:layout_height">24dp</item>
<item name="android:layout_width">24dp</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:scaleType">fitCenter</item>
- <item name="colorControlNormal">?colorIcon</item>
+ <item name="colorControlNormal">?android:attr/textColorSecondary</item>
</style>
<style name="Incall.Button.End" parent="android:Widget.Material.Button">