summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/voicemail
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-05-19 00:05:02 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-21 13:17:30 -0700
commit929539eb864822d669265b142bdcc49b6cf8ea6b (patch)
treefcaef3fac4068e3669ca5916f7a743d0d5e41bbb /java/com/android/dialer/voicemail
parentea7399a7c0c8a3832a6592aee0a0372c300b11f5 (diff)
Implement a global theme to be easily configured in Dialer.
deleted several colors and unified them across the app migrated several alert dialogs to support alert dialogs added many todos migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner Because of the test migration: - moved dialpad theme attributes into dialpad/theme - moved incall ui theme attributes into incallui/theme Bug: 79883035 Test: tap PiperOrigin-RevId: 197246477 Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad
Diffstat (limited to 'java/com/android/dialer/voicemail')
-rw-r--r--java/com/android/dialer/voicemail/listui/error/res/values/styles.xml6
-rw-r--r--java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml2
-rw-r--r--java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml13
-rw-r--r--java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml4
4 files changed, 13 insertions, 12 deletions
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
index bf70240b6..95866dfab 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
@@ -23,7 +23,7 @@
<item name="android:layout_marginStart">8dp</item>
<item name="android:layout_marginEnd">8dp</item>
<item name="android:padding">8dp</item>
- <item name="android:textColor">@color/dialer_theme_color</item>
+ <item name="android:textColor">?android:attr/colorPrimary</item>
<item name="android:fontFamily">"sans-serif-medium"</item>
<item name="android:focusable">true</item>
<item name="android:singleLine">true</item>
@@ -50,7 +50,7 @@
<style name="RaisedErrorActionStyle" parent="Widget.AppCompat.Button.Colored">
<item name="android:layout_width">wrap_content</item>
- <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
+ <item name="android:colorButtonNormal">?android:attr/colorPrimary</item>
<item name="android:textSize">14sp</item>
<item name="android:layout_height">@dimen/call_log_action_height</item>
</style>
@@ -62,7 +62,7 @@
</style>
<style name="TosLinkStyle">
- <item name="android:textColor">@color/dialer_theme_color</item>
+ <item name="android:textColor">?android:attr/colorPrimary</item>
<item name="android:fontFamily">"sans-serif-medium"</item>
</style>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
index 1bd36fa23..a001bd620 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
@@ -19,7 +19,7 @@
android:id="@+id/new_voicemail_frame_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/background_dialer_white"
+ android:background="?android:attr/colorBackground"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index 9a9e9ee0e..b5e095ba4 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -39,7 +39,7 @@
<TextView
android:id="@+id/primary_text"
- style="@style/PrimaryText"
+ style="@style/Dialer.TextAppearance.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
@@ -60,12 +60,13 @@
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
android:src="@drawable/quantum_ic_voicemail_vd_theme_24"
- android:tint="@color/dialtacts_theme_color"
- android:tintMode="multiply"/>
+ android:tint="?android:attr/colorPrimary"
+ android:tintMode="multiply"
+ tools:ignore="ContentDescription"/>
<TextView
android:id="@+id/secondary_text"
- style="@style/SecondaryText"
+ style="@style/Dialer.TextAppearance.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
@@ -76,7 +77,7 @@
<!-- TODO(a bug): Make text selectable -->
<TextView
android:id="@+id/transcription_text"
- style="@style/PrimaryText"
+ style="@style/Dialer.TextAppearance.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
@@ -86,7 +87,7 @@
<TextView
android:id="@+id/transcription_branding"
- style="@style/SecondaryText"
+ style="@style/Dialer.TextAppearance.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
index fba39f1c7..109cecc2c 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
@@ -87,14 +87,14 @@
style="@style/TosButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/dialer_theme_color"/>
+ android:textColor="?android:attr/colorPrimary"/>
<Button
android:id="@+id/voicemail_alert_primary_button"
style="@style/TosButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/dialer_theme_color"/>
+ android:textColor="?android:attr/colorPrimary"/>
</LinearLayout>
<View