summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-09-23 22:44:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-23 22:44:38 +0000
commit4ed0af251475e9c68b91fb3732ac96a906cec5f3 (patch)
treee90ac554fbb71b382ea242b7acafb917f24ab589 /InCallUI
parentcce4e74d75add0d1f2f4e36471c786d447f428e3 (diff)
parent103f96ca29f6ef6611da38b26e8e0525ec0485d1 (diff)
Merge "Add background to photo in in-call UI for transparent photos." into lmp-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout-land/call_card_content.xml1
-rw-r--r--InCallUI/res/layout/call_card_content.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index 336b46963..0bb45a244 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -63,6 +63,7 @@
android:gravity="start|center_vertical"
android:scaleType="centerCrop"
android:contentDescription="@string/contactPhoto"
+ android:background="@android:color/white"
android:src="@drawable/img_no_image_automirrored" />
<include layout="@layout/manage_conference_call_button"
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index 4f1b6f17c..a5fd8f72a 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -67,6 +67,7 @@
android:gravity="top|center_horizontal"
android:scaleType="centerCrop"
android:contentDescription="@string/contactPhoto"
+ android:background="@android:color/white"
android:src="@drawable/img_no_image_automirrored" />
<fragment android:name="com.android.incallui.VideoCallFragment"