diff options
author | Christine Chen <christinech@google.com> | 2013-09-27 16:38:38 -0700 |
---|---|---|
committer | Christine Chen <christinech@google.com> | 2013-09-27 17:05:48 -0700 |
commit | 68dc214eb6c67cfed37b6cf0c8e0725b599d3dff (patch) | |
tree | 0f9ebf9a1283341a281d527fc85870d954f897f5 /res/layout | |
parent | 1f7c971d2e74f1cddfdbd231c6d58ad40b2ac2f8 (diff) | |
download | packages_apps_InCallUI-68dc214eb6c67cfed37b6cf0c8e0725b599d3dff.tar.gz packages_apps_InCallUI-68dc214eb6c67cfed37b6cf0c8e0725b599d3dff.tar.bz2 packages_apps_InCallUI-68dc214eb6c67cfed37b6cf0c8e0725b599d3dff.zip |
Changes primary call card padding
- Also changes the secondary call card padding and alignment
Bug: 10955870
Change-Id: I781e2016914d6ce8e677cc8bc88ed909db23879c
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/primary_call_info.xml | 124 | ||||
-rw-r--r-- | res/layout/secondary_call_info.xml | 7 |
2 files changed, 68 insertions, 63 deletions
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml index f67c04aa..0d37a737 100644 --- a/res/layout/primary_call_info.xml +++ b/res/layout/primary_call_info.xml @@ -38,77 +38,81 @@ android:orientation="vertical"> <!-- "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. --> - <GridLayout android:id="@+id/primary_call_banner" - style="@style/PrimaryCallInfoPrimaryCallBanner" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="@dimen/call_banner_height" - android:background="@color/incall_call_banner_background" - android:paddingStart="@dimen/call_banner_side_padding" - android:paddingEnd="@dimen/call_banner_side_padding" - android:paddingTop="@dimen/call_banner_top_bottom_padding" - android:paddingBottom="@dimen/call_banner_top_bottom_padding"> + 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 android:id="@+id/primary_call_banner" + style="@style/PrimaryCallInfoPrimaryCallBanner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/call_banner_height" + android:paddingStart="@dimen/call_banner_side_padding" + android:paddingEnd="@dimen/call_banner_side_padding" + android:paddingTop="@dimen/call_banner_top_bottom_padding" + android:paddingBottom="@dimen/call_banner_top_bottom_padding" + android:background="@color/incall_call_banner_background"> <!-- Name (or the phone number, if we don't have a name to display). --> <TextView android:id="@+id/name" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/incall_call_banner_text_color" - android:singleLine="true" - android:textAlignment="viewStart" - android:layout_column="0" - android:layout_row="0" - android:layout_columnSpan="2" - android:layout_gravity="fill"/> + android:layout_alignParentTop="true" + android:layout_alignParentStart="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingEnd="@dimen/call_banner_name_number_right_padding" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/incall_call_banner_text_color" + android:singleLine="true" + android:textAlignment="viewStart"/> <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side --> - <TextView android:id="@+id/phoneNumber" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_call_banner_text_color" - android:singleLine="true" - android:textDirection="ltr" - android:layout_column="0" - android:layout_row="1" - android:layout_gravity="fill"/> + <LinearLayout android:id="@+id/labelAndNumber" + android:layout_below="@id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingEnd="@dimen/call_banner_name_number_right_padding" + 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_text_color" + android:singleLine="true" + android:textDirection="ltr" /> + <TextView android:id="@+id/label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/incall_call_banner_text_color" + android:textAllCaps="true" + android:singleLine="true" + android:layout_marginStart="6dp" /> + </LinearLayout> - <TextView android:id="@+id/label" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_call_banner_text_color" - android:textAllCaps="true" - android:singleLine="true" - android:paddingStart="6dp" - android:layout_column="1" - android:layout_row="1" - android:layout_gravity="fill"/> + <!-- Elapsed time indication for a call in progress. --> + <TextView android:id="@+id/elapsedTime" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/incall_call_banner_text_color" + android:singleLine="true" + android:visibility="invisible" /> <!-- 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:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/incall_callTypeSip" - android:maxLines="1" - android:layout_column="0" - android:layout_row="2" - android:layout_columnSpan="2" - android:ellipsize="end" - android:layout_gravity="fill"/> + android:layout_below="@id/labelAndNumber" + 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" /> + + </RelativeLayout> <!-- End of call_banner --> - <!-- Elapsed time indication for a call in progress. --> - <TextView android:id="@+id/elapsedTime" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/incall_call_banner_text_color" - android:singleLine="true" - android:visibility="invisible" - android:layout_column="2" - android:layout_row="0" - android:layout_rowSpan="3" - android:layout_gravity="fill" - android:gravity="end|center_vertical"/> - </GridLayout> - <!-- End of call_banner --> <LinearLayout android:id="@+id/supplementary_info_container" style="@style/PrimaryCallInfoSupplementaryInfoContainer" diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml index 97bc0bf9..787dc59b 100644 --- a/res/layout/secondary_call_info.xml +++ b/res/layout/secondary_call_info.xml @@ -43,18 +43,19 @@ android:layout_width="match_parent" android:layout_height="@dimen/call_banner_height" android:paddingStart="@dimen/call_banner_side_padding" - android:paddingEnd="@dimen/call_banner_side_padding" + android:paddingEnd="@dimen/secondary_call_banner_right_padding" android:paddingTop="@dimen/call_banner_top_bottom_padding" android:paddingBottom="@dimen/call_banner_top_bottom_padding" android:background="@color/incall_call_banner_background"> <!-- Name (or the phone number, if we don't have a name to display). --> <TextView android:id="@+id/secondaryCallName" style="@style/SecondaryCallInfoSecondaryCallName" - android:layout_gravity="top|start" + android:layout_gravity="bottom|start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/incall_call_banner_text_color" + android:ellipsize="marquee" android:singleLine="true"/> </FrameLayout> @@ -63,7 +64,7 @@ style="@style/SecondaryCallInfoSecondaryCallStatus" android:layout_width="wrap_content" android:layout_height="@dimen/call_banner_height" - android:gravity="top|end" + android:gravity="bottom|end" android:layout_gravity="end" android:paddingStart="@dimen/call_banner_side_padding" android:paddingEnd="@dimen/call_banner_side_padding" |