diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-22 15:30:39 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-29 23:24:53 -0700 |
commit | c5c42189eeab0389a94717de9a66c6d00068e8bf (patch) | |
tree | fbecd02f5176af6c8c2ac6bd620e117d341e62bf /java/com/android/dialer/calllog | |
parent | 4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (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/calllog')
7 files changed, 17 insertions, 40 deletions
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java index ec6e8a0fd..4b3697017 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java @@ -238,7 +238,6 @@ public final class NewCallLogFragment extends Fragment implements LoaderCallback private void configureEmptyContentView() { emptyContentView.setImage(R.drawable.quantum_ic_query_builder_vd_theme_24); - emptyContentView.setImageTint(R.color.empty_call_log_icon_tint_color, null); emptyContentView.setDescription(R.string.new_call_log_permission_no_calllog); emptyContentView.setActionLabel(com.android.dialer.widget.R.string.permission_single_turn_on); emptyContentView.setActionClickedListener(new TurnOnPhonePermissions()); 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 1bd71bb0f..0acd8155f 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,14 +60,12 @@ --> <TextView android:id="@+id/primary_text" - style="@style/Dialer.TextAppearance.Primary" + style="@style/Dialer.TextAppearance.Primary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="6dp" - android:ellipsize="end" android:lineSpacingMultiplier="1.5" - android:singleLine="true" tools:ignore="InefficientWeight"/> <ImageView @@ -120,23 +118,19 @@ <TextView android:id="@+id/secondary_text" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:lineSpacingMultiplier="1.4" - android:singleLine="true"/> + android:lineSpacingMultiplier="1.4"/> </LinearLayout> <!-- 3rd row: phone account info --> <TextView android:id="@+id/phone_account" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true"/> + android:layout_height="wrap_content"/> </LinearLayout> @@ -150,5 +144,5 @@ android:contentDescription="@string/a11y_new_call_log_expand_menu_for_entry" android:scaleType="center" android:src="@drawable/quantum_ic_more_vert_vd_theme_24" - android:tint="@color/dialer_secondary_text_color"/> + android:tint="?colorIcon"/> </RelativeLayout> diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml index e86ece534..a6d1f61f1 100644 --- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content"> <TextView android:id="@+id/new_call_log_header_text" - style="@style/SubHeader" + style="@style/Dialer.TextAppearance.Secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml index 0e6d551fb..fade6c7b9 100644 --- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml @@ -49,17 +49,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:fontFamily="sans-serif-medium" - android:textColor="@color/primary_material_dark" - android:textSize="@dimen/call_log_primary_text_size"/> + style="@style/Dialer.TextAppearance.Header2"/> <TextView android:id="@+id/new_call_log_promotion_card_details" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:lineSpacingExtra="8dp" - android:textColor="@color/primary_material_dark" - android:textSize="14sp"/> + style="@style/Dialer.TextAppearance.Secondary"/> <Button android:id="@+id/new_call_log_promotion_card_ok" android:layout_width="wrap_content" diff --git a/java/com/android/dialer/calllog/ui/res/values/colors.xml b/java/com/android/dialer/calllog/ui/res/values/colors.xml index 002aaf959..27a821e10 100644 --- a/java/com/android/dialer/calllog/ui/res/values/colors.xml +++ b/java/com/android/dialer/calllog/ui/res/values/colors.xml @@ -16,11 +16,10 @@ --> <resources> + <!-- TODO(a bug): remove these? --> <color name="feature_icon_read_color">#9E9E9E</color> <color name="feature_icon_unread_color">#474747</color> <color name="call_type_icon_read_color">#757575</color> <color name="call_type_icon_unread_color">#D32F2F</color> - - <color name="empty_call_log_icon_tint_color">#E1E1E1</color> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/calllog/ui/res/values/strings.xml b/java/com/android/dialer/calllog/ui/res/values/strings.xml index 3888eb90d..3f6462c7b 100644 --- a/java/com/android/dialer/calllog/ui/res/values/strings.xml +++ b/java/com/android/dialer/calllog/ui/res/values/strings.xml @@ -32,6 +32,7 @@ <!-- Header in call log to group calls from before yesterday. [CHAR LIMIT=30] --> <string name="new_call_log_header_older">Older</string> + <!-- Shown as a prompt to turn on the phone permission to enable the call log [CHAR LIMIT=NONE]--> <string name="new_call_log_permission_no_calllog">To see your call log, turn on the Phone permission.</string> diff --git a/java/com/android/dialer/calllog/ui/res/values/styles.xml b/java/com/android/dialer/calllog/ui/res/values/styles.xml index 047f1dace..3a02eb23f 100644 --- a/java/com/android/dialer/calllog/ui/res/values/styles.xml +++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml @@ -16,32 +16,19 @@ --> <resources> - <style name="primary_textview"> - <item name="android:textColor">@color/primary_text_color</item> - <item name="android:fontFamily">sans-serif</item> - </style> + <style name="primary_textview" parent="Dialer.TextAppearance.Primary"/> - <style name="primary_textview_unread_call"> - <item name="android:textColor">@color/primary_text_color</item> - <item name="android:fontFamily">sans-serif-medium</item> - </style> + <style name="primary_textview_unread_call" parent="Dialer.TextAppearance.Header2"/> - <style name="secondary_textview"> - <item name="android:textColor">@color/secondary_text_color</item> - <item name="android:fontFamily">sans-serif</item> - </style> + <style name="secondary_textview" parent="Dialer.TextAppearance.Secondary"/> - <style name="phoneaccount_textview"> - <item name="android:fontFamily">sans-serif</item> - </style> + <style name="phoneaccount_textview"/> - <style name="secondary_textview_unread_call"> - <item name="android:textColor">@color/missed_call</item> - <item name="android:fontFamily">sans-serif-medium</item> + <style name="secondary_textview_unread_call" parent="Dialer.TextAppearance.Header2"> + <item name="android:textColor">@color/dialer_red</item> </style> <style name="phoneaccount_textview_unread_call"> <item name="android:fontFamily">sans-serif-medium</item> </style> - </resources>
\ No newline at end of file |