summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/callcomposer/res
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-05-22 15:30:39 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-29 23:24:53 -0700
commitc5c42189eeab0389a94717de9a66c6d00068e8bf (patch)
treefbecd02f5176af6c8c2ac6bd620e117d341e62bf /java/com/android/dialer/callcomposer/res
parent4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff)
Began implementation of Dialer dark theme.
- README on how to properly theme Dialer going forward. - Migrated all widgets to use global colors. - Removed all activity and application themes where it wasn't necessary. - Added themeing test rule for Espresso tests. Bug: 79883035 Test: tap PiperOrigin-RevId: 197634256 Change-Id: I4b7d94d45aeeb59d484b0069fdd1e200a654910b
Diffstat (limited to 'java/com/android/dialer/callcomposer/res')
-rw-r--r--java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml13
-rw-r--r--java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml2
-rw-r--r--java/com/android/dialer/callcomposer/res/layout/permission_view.xml2
-rw-r--r--java/com/android/dialer/callcomposer/res/values/styles.xml6
4 files changed, 9 insertions, 14 deletions
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index 4d3769b6d..49d278f30 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -54,7 +54,7 @@
android:gravity="center"
android:maxLines="1"
android:ellipsize="end"
- android:textColor="?android:attr/colorBackground"
+ android:textColor="?android:attr/textColorPrimaryInverse"
android:textSize="@dimen/call_composer_name_text_size"/>
<TextView
@@ -62,10 +62,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:maxLines="1"
- android:ellipsize="end"
- android:textColor="?android:attr/colorBackground"
- android:textSize="@dimen/call_composer_number_text_size"/>
+ android:textColor="?android:attr/textColorPrimaryInverse"
+ style="@style/Dialer.TextAppearance.Primary"/>
</LinearLayout>
<QuickContactBadge
@@ -151,9 +149,8 @@
android:drawablePadding="@dimen/send_and_call_drawable_padding"
android:textAllCaps="true"
android:text="@string/share_and_call"
- android:textSize="@dimen/send_and_call_text_size"
- android:fontFamily="sans-serif-medium"
- android:textColor="?android:attr/colorBackground"/>
+ style="@style/Dialer.TextAppearance.Header2"
+ android:textColor="?android:attr/textColorPrimaryInverse"/>
</FrameLayout>
</FrameLayout>
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
index 49df9e679..6255e7289 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
@@ -64,7 +64,7 @@
android:paddingBottom="64dp"
android:textSize="@dimen/message_compose_item_text_size"
android:hint="@string/message_composer_custom_message_hint"
- android:textColor="@color/dialer_primary_text_color"
+ android:textColor="?android:attr/textColorPrimary"
android:textColorHint="?android:attr/textColorHint"
android:background="?android:attr/colorBackground"
android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
diff --git a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
index 783ba9867..4248046dc 100644
--- a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/permission_item_margin"
- style="@style/TextAppearanceMedium"/>
+ style="@style/Dialer.TextAppearance.Header2"/>
<TextView
android:id="@+id/allow"
diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml
index aeec2a369..cc0cc9028 100644
--- a/java/com/android/dialer/callcomposer/res/values/styles.xml
+++ b/java/com/android/dialer/callcomposer/res/values/styles.xml
@@ -30,12 +30,10 @@
<item name="android:actionBarItemBackground">@drawable/item_background_material_borderless_dark</item>
</style>
- <style name="message_composer_textview">
- <item name="android:textSize">@dimen/message_compose_item_text_size</item>
- <item name="android:textColor">@color/dialer_primary_text_color</item>
+ <style name="message_composer_textview" parent="Dialer.TextAppearance.Primary">
<item name="android:paddingStart">@dimen/message_composer_item_padding</item>
<item name="android:paddingEnd">@dimen/message_composer_item_padding</item>
- <item name="android:background">@drawable/item_background_material_light</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:gravity">center_vertical</item>
</style>
</resources> \ No newline at end of file