diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2015-11-20 01:14:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 01:14:20 +0000 |
| commit | 5bcaa5f14a852dbce54a1989f0b325f48ddfdf56 (patch) | |
| tree | 73b3a1b03ba30e64ab7114886026acd8cee34ca0 | |
| parent | 7a3a3c64d187b8b604b1f3358f43d28e2084978b (diff) | |
| parent | dc6e6e5fc17fade062015f744536ed27e8be1a8f (diff) | |
Moving elapsed time out of label and number layout
am: c92a847e0f
* commit 'c92a847e0f5951d9377c6d50300a2f24c2c50b40':
Moving elapsed time out of label and number layout
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index d149a3c45..629d22047 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -161,18 +161,16 @@ android:visibility="gone" /> <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side --> - <RelativeLayout android:id="@+id/labelAndNumber" - android:layout_width="0dp" - android:layout_height="match_parent" + <LinearLayout android:id="@+id/labelAndNumber" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_weight="1" - android:orientation="horizontal" - android:gravity="start"> + android:orientation="horizontal"> <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" + android:layout_weight="0" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/incall_call_banner_subtext_color" android:textSize="@dimen/call_label_text_size" @@ -183,9 +181,8 @@ <TextView android:id="@+id/phoneNumber" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" android:layout_marginStart="6dp" - android:layout_alignParentTop="true" - android:layout_toEndOf="@id/label" android:textAlignment="viewStart" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/incall_call_banner_subtext_color" @@ -193,17 +190,19 @@ android:singleLine="false" android:visibility="gone" /> - <TextView android:id="@+id/elapsedTime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentEnd="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_call_banner_subtext_color" - android:textSize="@dimen/call_label_text_size" - android:visibility="gone" /> + </LinearLayout> - </RelativeLayout> + <!-- 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_weight="0" + android:textAlignment="viewEnd" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/incall_call_banner_subtext_color" + android:textSize="@dimen/call_label_text_size" + android:singleLine="true" + android:visibility="gone" /> </LinearLayout> |