summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2016-01-14 17:33:53 -0800
committerStephen Bird <sbird@cyngn.com>2016-04-08 10:15:57 -0700
commit03414c9e072339b1f82d5450593f8ba86d970210 (patch)
tree170d2e450bd12130067e9b685c732c5123f6cd85 /res/layout
parent0e7b096e00b9a42d3e6f420e9296d288833fa92c (diff)
downloadandroid_packages_apps_Dialer-03414c9e072339b1f82d5450593f8ba86d970210.tar.gz
android_packages_apps_Dialer-03414c9e072339b1f82d5450593f8ba86d970210.tar.bz2
android_packages_apps_Dialer-03414c9e072339b1f82d5450593f8ba86d970210.zip
Initial Bringup of InCall Call Log modifications
Change-Id: I42401aec993107b897ea301b69eb2ec9c4acb238
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_log_list_item.xml7
-rw-r--r--res/layout/contact_image_with_attribution.xml16
2 files changed, 18 insertions, 5 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index ec512b67f..089f822ae 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -60,14 +60,11 @@
android:nextFocusRight="@+id/call_back_action"
android:nextFocusLeft="@+id/quick_contact_photo" >
- <QuickContactBadge
+ <com.android.dialer.widget.DialerQuickContact
android:id="@+id/quick_contact_photo"
android:layout_width="@dimen/contact_photo_size"
android:layout_height="@dimen/contact_photo_size"
- android:paddingTop="2dp"
- android:nextFocusRight="@id/primary_action_view"
- android:layout_gravity="top"
- android:focusable="true" />
+ android:layout_marginEnd="@dimen/contact_list_badge_margin"/>
<LinearLayout
android:layout_width="0dp"
diff --git a/res/layout/contact_image_with_attribution.xml b/res/layout/contact_image_with_attribution.xml
new file mode 100644
index 000000000..8ebf2c542
--- /dev/null
+++ b/res/layout/contact_image_with_attribution.xml
@@ -0,0 +1,16 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <QuickContactBadge
+ android:id="@+id/contact_photo"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
+
+ <ImageView
+ android:id="@+id/attribution_logo"
+ android:layout_height="0dp"
+ android:layout_width="0dp"
+ android:scaleType="fitCenter"
+ android:layout_gravity="bottom|right"
+ android:visibility="gone"/>
+
+</merge>