summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-11-03 17:42:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-03 17:42:23 +0000
commit814999fa401de9690a5cb2a634accbef7a275a64 (patch)
tree65b687a11efec36cc690cb0ef47988ca402f1950 /res
parente5ac4f69e52396216dff8f22a1ca4283add1b1d5 (diff)
parent047919c467676cf5a449c774aab0c63558cd1eaa (diff)
am 047919c4: am 92db4b04: am bd421b68: Merge "Add an additional line to Call Log for PhoneAccount name" into lmp-mr1-dev
* commit '047919c467676cf5a449c774aab0c63558cd1eaa': Add an additional line to Call Log for PhoneAccount name
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_list_item.xml19
1 files changed, 10 insertions, 9 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index c77a1f7ad..db59b74d3 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -112,15 +112,6 @@
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:layout_gravity="center_vertical"
/>
- <ImageView
- android:id="@+id/call_account_icon"
- android:layout_width="@dimen/call_provider_small_icon_size"
- android:layout_height="@dimen/call_provider_small_icon_size"
- android:layout_marginEnd="@dimen/call_log_icon_margin"
- android:layout_gravity="center_vertical"
- android:tint="?attr/call_log_secondary_text_color"
- android:scaleType="centerInside"
- />
<TextView
android:id="@+id/call_location_and_date"
android:layout_width="wrap_content"
@@ -132,6 +123,16 @@
android:singleLine="true"
/>
</LinearLayout>
+ <TextView
+ android:id="@+id/call_account_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="@dimen/call_log_icon_margin"
+ android:textColor="?attr/call_log_secondary_text_color"
+ android:textSize="@dimen/call_log_secondary_text_size"
+ android:visibility="gone"
+ android:singleLine="true"
+ />
</LinearLayout>
<ImageView
android:id="@+id/call_indicator_icon"