From 43e6be2588058cb09338517f302350b046251066 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 9 Jul 2014 09:11:02 +0200
Subject: Don't expand the contact picture behind the call buttons during call.

Doing that avoids stretching more than needed. To avoid a visual 'jump'
of the contact picture when answering the call, animate the contact
picture layout transition.

Change-Id: I6a83281ce594ad2b00aaeb161d5e1c0cb6e4bdef
---
 res/layout/primary_call_info.xml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'res/layout/primary_call_info.xml')

diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index b1ee979e..821334a8 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -21,16 +21,25 @@
              android:layout_height="0dp"
              android:layout_weight="1">
 
-    <!-- Contact photo for primary call info -->
-    <ImageView android:id="@+id/photo"
-               android:layout_alignParentStart="true"
-               android:layout_alignParentTop="true"
-               android:layout_width="match_parent"
-               android:layout_height="match_parent"
-               android:gravity="top|center_horizontal"
-               android:scaleType="centerCrop"
-               android:contentDescription="@string/contactPhoto"
-               android:src="@drawable/picture_unknown"/>
+    <FrameLayout
+            android:id="@+id/photo_container"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="top|center_horizontal"
+            android:animateLayoutChanges="true">
+
+        <!-- Contact photo for primary call info -->
+        <view class="com.android.incallui.CallCardFragment$PhotoImageView"
+                android:id="@+id/photo"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:contentDescription="@string/contactPhoto"
+                android:src="@drawable/picture_unknown"/>
+
+    </FrameLayout>
 
     <LinearLayout
             android:layout_width="match_parent"
-- 
cgit v1.2.3