diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-13 06:16:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-13 06:16:47 +0000 |
| commit | 25f24a79a24334e23706c2a8d69903820c622edb (patch) | |
| tree | a9ba1a68c4c0ce03c99f65408ff35bcb10fee0ba | |
| parent | 4af5bf57c2e9c848dc3d7e00b3dad807a0d5bcf4 (diff) | |
| parent | c863f711817c7a87aaf1bf3d8707a4b4353894ac (diff) | |
Merge "Fixed recycling issues in new call log."
| -rw-r--r-- | java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/calllog/ui/res/values/styles.xml | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java index 7c33c8721..2938d083b 100644 --- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java +++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java @@ -105,6 +105,9 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { primaryTextView.setTextAppearance(R.style.primary_textview_new_call); // TODO(zachh): Styling for call type icons when the call is new. secondaryTextView.setTextAppearance(R.style.secondary_textview_new_call); + } else { + primaryTextView.setTextAppearance(R.style.primary_textview); + secondaryTextView.setTextAppearance(R.style.secondary_textview); } setNumberCalls(row); @@ -158,6 +161,7 @@ final class NewCallLogViewHolder extends RecyclerView.ViewHolder { private void setSecondaryCallTypes(CoalescedRow row) { // Only call type icon is shown before the secondary text. + secondaryCallTypeIconsView.clear(); secondaryCallTypeIconsView.add(row.callType()); // TODO(zachh): Per new mocks, may need to add method to CallTypeIconsView to disable coloring. 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 23cb93e1a..f8502370a 100644 --- a/java/com/android/dialer/calllog/ui/res/values/styles.xml +++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml @@ -16,10 +16,21 @@ --> <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_new_call"> + <item name="android:textColor">@color/primary_text_color</item> <item name="android:fontFamily">sans-serif-medium</item> </style> + <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_new_call"> <item name="android:textColor">@color/missed_call</item> <item name="android:fontFamily">sans-serif-medium</item> |