summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/calllog
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/calllog
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/calllog')
-rw-r--r--java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml4
-rw-r--r--java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml8
-rw-r--r--java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml4
3 files changed, 8 insertions, 8 deletions
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
index 8084635d8..93fd0ac40 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
@@ -18,8 +18,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/background_dialer_light"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="?android:attr/colorBackground">
<LinearLayout
android:layout_width="match_parent"
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index b022abbda..1bd71bb0f 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -60,7 +60,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_weight="1"
@@ -96,7 +96,7 @@
<TextView
android:id="@+id/call_count"
- style="@style/PrimaryText"
+ style="@style/Dialer.TextAppearance.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
@@ -120,7 +120,7 @@
<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"
@@ -132,7 +132,7 @@
<!-- 3rd row: phone account info -->
<TextView
android:id="@+id/phone_account"
- style="@style/SecondaryText"
+ style="@style/Dialer.TextAppearance.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
index 1a2ec22d6..3275cc0a6 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
@@ -25,13 +25,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
- android:background="@color/background_dialer_white"
+ android:background="?android:attr/colorBackground"
android:clipToPadding="false"/>
<com.android.dialer.widget.EmptyContentView
android:gravity="center_vertical"
android:id="@+id/new_call_log_empty_content_view"
- android:background="@color/background_dialer_white"
+ android:background="?android:attr/colorBackground"
android:layout_gravity="center"
android:layout_height="match_parent"
android:layout_width="match_parent"