Rollforward: Move elapsed time to same layout as label and number.

It used to be aligned with the primary call info, but now it will
be vertically aligned with the label and number. If there is no
label and number, it will be aligned left.

Change-Id: I92af8e95277956d76d7b2795743c13fa8728cc9e

1 files changed, 33 insertions, 33 deletions

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index bfa4c7a13..db18e4dfa 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -58,56 +58,56 @@
                     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" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <TextView android:id="@+id/name"
+                    <!-- 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:fontFamily="sans-serif-light"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textSize="@dimen/call_name_text_size"
-                        android:singleLine="true" />
+                        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/textAppearanceMedium"
-                        android:textColor="@color/incall_call_banner_text_color"
-                        android:singleLine="true"
-                        android:visibility="gone" />
-
-                </LinearLayout>
-
-                <!-- 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="match_parent"
-                    android:layout_height="wrap_content"
-                    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" />
+                        android:visibility="gone" />
 
                 </LinearLayout>