diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-23 22:53:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 22:53:47 +0000 |
| commit | 9a212faad9edf38f0d9b527abd0bfe9491d256d7 (patch) | |
| tree | 0b312cecaec186d7c4ecb5135343111a64067ec7 | |
| parent | 225de4b7cae9bf5d9a949ed92574c552cae1a082 (diff) | |
| parent | 4ed0af251475e9c68b91fb3732ac96a906cec5f3 (diff) | |
am 522077ba: Merge "Add background to photo in in-call UI for transparent photos." into lmp-dev
* commit '522077bac1eedc24fa8ff717545224b903bacdc5':
Add background to photo in in-call UI for transparent photos.
| -rw-r--r-- | InCallUI/res/layout-land/call_card_content.xml | 1 | ||||
| -rw-r--r-- | InCallUI/res/layout/call_card_content.xml | 1 |
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" |