diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-23 23:05:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 23:05:39 +0000 |
| commit | 8be785f1f023f03820451379808879ce98675162 (patch) | |
| tree | 389f1e15ae4bd7f459d6725a846c1e2a540b01a8 | |
| parent | fc85055f4047b9af1315dc46d322c96a9e24c22c (diff) | |
| parent | 35cb00f7eae2e25094a998bd8c5864f86a8dbc59 (diff) | |
| download | packages_apps_InCallUI-8be785f1f023f03820451379808879ce98675162.tar.gz packages_apps_InCallUI-8be785f1f023f03820451379808879ce98675162.tar.bz2 packages_apps_InCallUI-8be785f1f023f03820451379808879ce98675162.zip | |
am 35cb00f7: am 522077ba: Merge "Add background to photo in in-call UI for transparent photos." into lmp-dev
* commit '35cb00f7eae2e25094a998bd8c5864f86a8dbc59':
Add background to photo in in-call UI for transparent photos.
| -rw-r--r-- | res/layout-land/call_card_content.xml | 1 | ||||
| -rw-r--r-- | res/layout/call_card_content.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/res/layout-land/call_card_content.xml b/res/layout-land/call_card_content.xml index 336b4696..0bb45a24 100644 --- a/res/layout-land/call_card_content.xml +++ b/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/res/layout/call_card_content.xml b/res/layout/call_card_content.xml index 4f1b6f17..a5fd8f72 100644 --- a/res/layout/call_card_content.xml +++ b/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" |