diff options
| author | Ed Heyl <edheyl@google.com> | 2014-05-13 18:36:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-13 18:36:30 +0000 |
| commit | f06fd0e669a9c50cd96ce75e5690f24a18c38c10 (patch) | |
| tree | 473157d5cbd6ffca88aed31591feb7d79d40b1e1 /InCallUI | |
| parent | faba6a249a4fd83cf659a6470b4b313474a5e409 (diff) | |
| parent | 701b235d555bea0dd29bc59551d5b677eb451088 (diff) | |
Merge "Fix build: Revert "Move elapsed time to same layout as label and number.""
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 66 |
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 db18e4dfa..bfa4c7a13 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"> - <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side --> - <LinearLayout android:id="@+id/labelAndNumber" - android:layout_below="@id/stateAndName" + <TextView android:id="@+id/name" 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> + android:fontFamily="sans-serif-light" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="@dimen/call_name_text_size" + android:singleLine="true" /> <!-- 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:visibility="gone" /> + 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> |