From e8645f36f3c9ddbfaf8f9e104886ced4019787d9 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Fri, 16 May 2014 10:11:28 -0700
Subject: Further improvements to InCall transition animation

* Remove unneeded parent layouts in call_card.xml
* Individual child views in the call card container now translate
upwards

Bug: 14820894

Change-Id: I04411b76f99b4d519d4ef30400f134e8b9191aa6
---
 InCallUI/res/layout/call_card.xml         |   3 +-
 InCallUI/res/layout/primary_call_info.xml | 171 ++++++++++++++----------------
 InCallUI/res/values/dimens.xml            |   2 +
 3 files changed, 86 insertions(+), 90 deletions(-)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index cfcd98073..cf7a49009 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -48,7 +48,8 @@
                 android:orientation="vertical"
                 android:translationZ="@dimen/primary_call_translation_z"
                 android:background="@color/incall_call_banner_background_color"
-                >
+                android:clipChildren="false"
+                android:clipToPadding="false" >
 
                 <include layout="@layout/primary_call_info" />
 
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 048164bd6..ea1d69f69 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -16,115 +16,108 @@
   ~ limitations under the License
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-         android:layout_width="match_parent"
-         android:layout_height="wrap_content" >
-
-    <LinearLayout
+<!-- "Call Banner" for primary call, the foregound or ringing call.Di
+ The "call banner" is a block of info about a single call,
+ including the contact name, phone number, call time counter,
+ and other status info.  This info is shown as a "banner"
+ overlaid across the top of contact photo. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/primary_call_banner"
+    style="@style/PrimaryCallInfoPrimaryCallBanner"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/call_banner_height"
+    android:paddingStart="@dimen/call_banner_side_padding"
+    android:paddingEnd="@dimen/call_banner_side_padding"
+    android:paddingTop="@dimen/call_banner_primary_call_top_padding"
+    android:paddingBottom="@dimen/call_banner_top_bottom_padding"
+    android:clipChildren="false"
+    android:clipToPadding="false" >
+
+    <!-- Name (or the phone number, if we don't have a name to display). -->
+    <LinearLayout android:id="@+id/stateAndName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:animateLayoutChanges="true"
+        android:clipChildren="false"
+        android:clipToPadding="false" >
+
+        <TextView android:id="@+id/callStateLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="@dimen/call_status_text_size"
+            android:singleLine="true"
+            android:gravity="start"
+            android:ellipsize="end" />
 
-        <!-- "Call Banner" for primary call, the foregound or ringing call.Di
-         The "call banner" is a block of info about a single call,
-         including the contact name, phone number, call time counter,
-         and other status info.  This info is shown as a "banner"
-         overlaid across the top of contact photo. -->
-        <RelativeLayout android:id="@+id/primary_call_banner"
-            style="@style/PrimaryCallInfoPrimaryCallBanner"
+        <TextView android:id="@+id/name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="@dimen/call_banner_height"
-            android:paddingStart="@dimen/call_banner_side_padding"
-            android:paddingEnd="@dimen/call_banner_side_padding"
-            android:paddingTop="@dimen/call_banner_primary_call_top_padding"
-            android:paddingBottom="@dimen/call_banner_top_bottom_padding" >
+            android:fontFamily="sans-serif-light"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="@dimen/call_name_text_size"
+            android:singleLine="true" />
 
-            <!-- Name (or the phone number, if we don't have a name to display). -->
-            <LinearLayout android:id="@+id/stateAndName"
-                android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:clipChildren="false"
+            android:clipToPadding="false" >
+
+            <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
+            <LinearLayout android:id="@+id/labelAndNumber"
+                android:layout_below="@id/stateAndName"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_centerInParent="true"
-                android:animateLayoutChanges="true">
+                android:layout_weight="1"
+                android:orientation="horizontal">
 
-                <TextView android:id="@+id/callStateLabel"
-                    android:layout_width="match_parent"
+                <TextView android:id="@+id/phoneNumber"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/call_status_text_size"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/incall_call_banner_secondary_text_color"
+                    android:textSize="@dimen/call_label_text_size"
                     android:singleLine="true"
-                    android:gravity="start"
-                    android:ellipsize="end" />
-
-                <TextView android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-light"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/call_name_text_size"
-                    android:singleLine="true" />
+                    android:textDirection="ltr" />
 
-                <LinearLayout
+                <TextView android:id="@+id/label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-                    <LinearLayout android:id="@+id/labelAndNumber"
-                        android:layout_below="@id/stateAndName"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="horizontal">
-
-                        <TextView android:id="@+id/phoneNumber"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="@color/incall_call_banner_secondary_text_color"
-                            android:textSize="@dimen/call_label_text_size"
-                            android:singleLine="true"
-                            android:textDirection="ltr" />
-
-                        <TextView android:id="@+id/label"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="@color/incall_call_banner_secondary_text_color"
-                            android:textSize="@dimen/call_label_text_size"
-                            android:singleLine="true"
-                            android:layout_marginStart="6dp" />
-
-                    </LinearLayout>
-
-                    <!-- Elapsed time indication for a call in progress. -->
-                    <TextView android:id="@+id/elapsedTime"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/incall_call_banner_secondary_text_color"
-                        android:singleLine="true"
-                        android:visibility="gone" />
-
-                </LinearLayout>
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/incall_call_banner_secondary_text_color"
+                    android:textSize="@dimen/call_label_text_size"
+                    android:singleLine="true"
+                    android:layout_marginStart="6dp" />
 
             </LinearLayout>
 
-            <!-- Call type indication: a special label and/or branding
-                 for certain kinds of calls (like "Internet call" for a SIP call.) -->
-            <TextView android:id="@+id/callTypeLabel"
-                android:layout_below="@id/labelAndNumber"
+            <!-- Elapsed time indication for a call in progress. -->
+            <TextView android:id="@+id/elapsedTime"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:maxLines="1"
-                android:ellipsize="end" />
+                android:textColor="@color/incall_call_banner_secondary_text_color"
+                android:singleLine="true"
+                android:visibility="gone" />
 
-        </RelativeLayout>  <!-- End of call_banner -->
+        </LinearLayout>
 
     </LinearLayout>
 
-</FrameLayout>
+    <!-- Call type indication: a special label and/or branding
+         for certain kinds of calls (like "Internet call" for a SIP call.) -->
+    <TextView android:id="@+id/callTypeLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/incall_call_banner_text_color"
+        android:maxLines="1"
+        android:ellipsize="end" />
+
+</RelativeLayout>  <!-- End of call_banner -->
\ No newline at end of file
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index af608a6cf..c7b02bb0b 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -100,4 +100,6 @@
     <dimen name="translucent_shadow_height">2dp</dimen>
 
     <dimen name="end_call_button_margin_bottom">8dp</dimen>
+
+    <dimen name="call_card_anim_translate_y_offset">50dp</dimen>
 </resources>
-- 
cgit v1.2.3