diff options
author | Nancy Chen <nancychen@google.com> | 2015-10-24 00:05:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-24 00:05:13 +0000 |
commit | 533be9eade137cff8ad0e408c8bbe4b287811418 (patch) | |
tree | 6566a27ab955db4371a57aed12c34ccc4307114c /InCallUI/res | |
parent | 95fa53623dbde481cedb9ee2185fe1c0aaa702f3 (diff) | |
parent | 444a9f789db7db66c58d8dde4f56349f725f7483 (diff) |
Merge "Fix indenting in primary_call_info.xml." into ub-contactsdialer-a-dev
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 263 |
1 files changed, 131 insertions, 132 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index ea6605b33..c03b9683c 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -41,170 +41,169 @@ android:clipToPadding="false" android:gravity="center"> - <LinearLayout android:id="@+id/callSubjectLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <TextView android:id="@+id/callSubject" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAlignment="viewStart" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_call_banner_background_color" - android:textSize="@dimen/call_label_text_size" - android:background="@drawable/subject_bubble" - android:maxLines="2" - android:ellipsize="end" - android:singleLine="false" - android:visibility="gone" /> - </LinearLayout> + <LinearLayout android:id="@+id/callSubjectLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false"> + + <TextView android:id="@+id/callSubject" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/incall_call_banner_background_color" + android:textSize="@dimen/call_label_text_size" + android:background="@drawable/subject_bubble" + android:maxLines="2" + android:ellipsize="end" + android:singleLine="false" + android:visibility="gone" /> + </LinearLayout> - <LinearLayout android:id="@+id/callStateButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <!-- Subscription provider or WiFi calling icon displayed to the left of the label --> - <ImageView android:id="@+id/callStateIcon" - android:layout_width="24dp" - android:layout_height="match_parent" - android:layout_marginEnd="10dp" - android:tint="@color/incall_accent_color" - android:alpha="0.0" - android:scaleType="fitCenter" - android:visibility="gone" /> + <LinearLayout android:id="@+id/callStateButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false"> + + <!-- Subscription provider or WiFi calling icon displayed to the left of the label --> + <ImageView android:id="@+id/callStateIcon" + android:layout_width="24dp" + android:layout_height="match_parent" + android:layout_marginEnd="10dp" + android:tint="@color/incall_accent_color" + android:alpha="0.0" + android:scaleType="fitCenter" + android:visibility="gone" /> - <ImageView android:id="@+id/videoCallIcon" - android:src="@drawable/ic_toolbar_video" - android:layout_width="16dp" - android:layout_height="match_parent" - android:layout_marginEnd="16dp" - android:baselineAlignBottom="true" - android:tint="@color/incall_accent_color" - android:scaleType="center" - android:visibility="gone" /> + <ImageView android:id="@+id/videoCallIcon" + android:src="@drawable/ic_toolbar_video" + android:layout_width="16dp" + android:layout_height="match_parent" + android:layout_marginEnd="16dp" + android:baselineAlignBottom="true" + android:tint="@color/incall_accent_color" + android:scaleType="center" + android:visibility="gone" /> + <com.android.phone.common.widget.ResizingTextTextView + xmlns:ex="http://schemas.android.com/apk/res-auto" + android:id="@+id/callStateLabel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textColor="@color/incall_accent_color" + android:textSize="@dimen/call_status_text_size" + android:alpha="0.7" + android:singleLine="true" + android:gravity="start" + android:ellipsize="end" + ex:resizing_text_min_size="@dimen/call_status_text_min_size" /> + + </LinearLayout> + + <!-- Name (or the phone number, if we don't have a name to display). --> <com.android.phone.common.widget.ResizingTextTextView xmlns:ex="http://schemas.android.com/apk/res-auto" - android:id="@+id/callStateLabel" + android:id="@+id/name" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="-5dp" + android:fontFamily="sans-serif-light" android:textAlignment="viewStart" android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="@color/incall_accent_color" - android:textSize="@dimen/call_status_text_size" - android:alpha="0.7" + android:textSize="@dimen/call_name_text_size" android:singleLine="true" - android:gravity="start" - android:ellipsize="end" - ex:resizing_text_min_size="@dimen/call_status_text_min_size" /> - - </LinearLayout> - - <!-- Name (or the phone number, if we don't have a name to display). --> - <com.android.phone.common.widget.ResizingTextTextView - xmlns:ex="http://schemas.android.com/apk/res-auto" - android:id="@+id/name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="-5dp" - android:fontFamily="sans-serif-light" - android:textAlignment="viewStart" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textSize="@dimen/call_name_text_size" - android:singleLine="true" - ex:resizing_text_min_size="@dimen/call_name_text_min_size" /> - - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <ImageView android:id="@+id/hdAudioIcon" - android:src="@drawable/ic_hd_24dp" - android:layout_width="24dp" - android:layout_height="match_parent" - android:layout_marginEnd="8dp" - android:tint="@color/incall_call_banner_subtext_color" - android:scaleType="fitCenter" - android:visibility="gone" /> - - <ImageView android:id="@+id/forwardIcon" - android:src="@drawable/ic_forward_white_24dp" - android:layout_width="24dp" - android:layout_height="match_parent" - android:layout_marginEnd="8dp" - android:tint="@color/incall_call_banner_subtext_color" - android:scaleType="fitCenter" - android:visibility="gone" /> + ex:resizing_text_min_size="@dimen/call_name_text_min_size" /> - <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side --> - <LinearLayout android:id="@+id/labelAndNumber" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="horizontal"> + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false"> + + <ImageView android:id="@+id/hdAudioIcon" + android:src="@drawable/ic_hd_24dp" + android:layout_width="24dp" + android:layout_height="match_parent" + android:layout_marginEnd="8dp" + android:tint="@color/incall_call_banner_subtext_color" + android:scaleType="fitCenter" + android:visibility="gone" /> - <TextView android:id="@+id/label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_call_banner_subtext_color" - android:textSize="@dimen/call_label_text_size" - android:singleLine="true" - android:textDirection="ltr" + <ImageView android:id="@+id/forwardIcon" + android:src="@drawable/ic_forward_white_24dp" + android:layout_width="24dp" + android:layout_height="match_parent" + android:layout_marginEnd="8dp" + android:tint="@color/incall_call_banner_subtext_color" + android:scaleType="fitCenter" android:visibility="gone" /> - <TextView android:id="@+id/phoneNumber" + <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side --> + <LinearLayout android:id="@+id/labelAndNumber" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginStart="6dp" - android:textAlignment="viewStart" + android:orientation="horizontal"> + + <TextView android:id="@+id/label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/incall_call_banner_subtext_color" + android:textSize="@dimen/call_label_text_size" + android:singleLine="true" + android:textDirection="ltr" + android:visibility="gone" /> + + <TextView android:id="@+id/phoneNumber" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginStart="6dp" + android:textAlignment="viewStart" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/incall_call_banner_subtext_color" + android:textSize="@dimen/call_label_text_size" + android:singleLine="false" + android:visibility="gone" /> + + </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_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="false" + android:singleLine="true" android:visibility="gone" /> </LinearLayout> - <!-- Elapsed time indication for a call in progress. --> - <TextView android:id="@+id/elapsedTime" + <!-- Call type indication: a special label and/or branding + for certain kinds of calls (like "SIP call" for a SIP call.) --> + <TextView android:id="@+id/callTypeLabel" 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:textColor="@color/incall_call_banner_text_color" + android:maxLines="1" + android:ellipsize="end" android:visibility="gone" /> </LinearLayout> - <!-- Call type indication: a special label and/or branding - for certain kinds of calls (like "SIP 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" - android:visibility="gone" /> - - </LinearLayout> - <!-- Contact photo for primary call info --> <ImageView android:id="@+id/photoSmall" android:layout_width="@dimen/contact_context_small_photo_size" |