Reposition SIP call label

Bug: 14981389
Change-Id: I63b39643cee84634581b9122752d16b472f7d7e9

3 files changed, 17 insertions, 18 deletions

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index ea1d69f69..f483471f4 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -16,11 +16,10 @@
   ~ limitations under the License
   -->
 
-<!-- "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. -->
+<!-- "Call Banner" for primary call, the foregound or ringing call. 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"
@@ -108,16 +107,16 @@
 
         </LinearLayout>
 
-    </LinearLayout>
-
-    <!-- Call type indication: a special label and/or branding
+        <!-- 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" />
+        <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" />
+
+    </LinearLayout>
 
 </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 c7b02bb0b..c01b9699f 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -20,7 +20,7 @@
 
     <!-- Height of the "call banner" overlay on top of the upper part of
          the call info area. -->
-    <dimen name="call_banner_height">128dp</dimen>
+    <dimen name="call_banner_height">148dp</dimen>
 
     <!-- Margin between the bottom of the "call card" photo
          and the top of the in-call button cluster. -->
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 1276f4403..f43d66bd5 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -621,8 +621,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             public void onAnimationStart(Animator animation) {
                 assignTranslateAnimation(mCallStateLabel, 1);
                 assignTranslateAnimation(mPrimaryName, 2);
-                assignTranslateAnimation(mCallTypeLabel, 3);
-                assignTranslateAnimation(mCallNumberAndLabel, 4);
+                assignTranslateAnimation(mCallNumberAndLabel, 3);
+                assignTranslateAnimation(mCallTypeLabel, 4);
                 assignTranslateAnimation(mCallButtonsContainer, 5);
 
                 mEndCallButton.animate().translationY(0)