Merge "Pixel Perfect for Favorites in Phone app." (bb00677c) · Commits · e / os / android_packages_apps_Contacts

res/layout/contact_tile_frequent.xml

+38 −24

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.contacts.list.ContactTileView"
		android:focusable="true"
		android:background="@drawable/list_selector"
		android:background="@null"
		android:paddingRight="16dip"
		android:paddingLeft="16dip" >

		@@ -32,32 +32,46 @@
		android:scaleType="centerCrop"
		android:layout_alignParentRight="true" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="64dip"
		android:orientation="vertical"
		android:layout_alignParentBottom="true"
		android:gravity="center_vertical"
		android:paddingRight="80dip"
		android:paddingLeft="8dip">

		<TextView
		android:id="@+id/contact_tile_name"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/primary_text_color"
		android:textSize="18sp"
		android:singleLine="true"
		android:ellipsize="end"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_toLeftOf="@id/contact_tile_quick" />

		<ImageView
		android:id="@+id/contact_tile_presence"
		android:layout_width="16dip"
		android:layout_height="16dip"
		android:layout_below="@id/contact_tile_name"
		android:layout_alignParentLeft="true" />
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		<TextView
		android:id="@+id/contact_tile_status"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="14sp"
		android:ellipsize="end"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:singleLine="true"
		android:textColor="#cccccc"
		android:layout_toRightOf="@id/contact_tile_presence"
		android:layout_below="@id/contact_tile_name" />
		android:drawablePadding="4dip"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		</LinearLayout>

		<View
		android:id="@+id/contact_tile_horizontal_divider"
		android:layout_width="match_parent"
		android:layout_height="1px"
		android:background="?android:attr/listDivider"
		android:layout_below="@id/contact_tile_quick" />

		</RelativeLayout>

res/layout/contact_tile_frequent_phone.xml

+11 −16

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.contacts.list.ContactTileView"
		android:focusable="true"
		android:background="@drawable/list_selector"
		android:background="@null"
		android:paddingRight="16dip"
		android:paddingLeft="16dip" >

		@@ -36,22 +36,24 @@
		android:id="@+id/contact_tile_name"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="end"
		android:layout_marginLeft="8dip"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:layout_marginTop="8dip"
		android:layout_toRightOf="@id/contact_tile_quick" />
		android:layout_toRightOf="@id/contact_tile_quick"
		android:singleLine="true"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		<TextView
		android:id="@+id/contact_tile_phone_number"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="14sp"
		android:ellipsize="end"
		android:singleLine="true"
		android:textColor="@color/dialtacts_secondary_text_color"
		android:layout_marginLeft="8dip"
		android:singleLine="true"
		android:maxLength="18"
		android:layout_toRightOf="@id/contact_tile_quick"
		android:layout_below="@id/contact_tile_name" />

		@@ -65,23 +67,16 @@
		android:textAllCaps="true"
		android:textColor="@color/dialtacts_secondary_text_color"
		android:layout_marginLeft="12dip"
		android:maxLength="8"
		android:layout_alignParentRight="true"
		android:layout_alignTop="@id/contact_tile_phone_number" />

		<View
		android:id="@+id/contact_tile_horizontal_divider"
		android:layout_width="match_parent"
		android:layout_height="1dip"
		android:layout_height="1px"
		android:background="?android:attr/listDivider"
		android:layout_alignParentBottom="true" />

		<View
		android:id="@+id/contact_tile_horizontal_picture_divider"
		android:layout_width="64dip"
		android:layout_height="1dip"
		android:background="@android:color/black"
		android:layout_alignParentBottom="true"
		android:layout_alignParentLeft="true" />
		android:layout_below="@id/contact_tile_quick" />

		</RelativeLayout>

res/layout/contact_tile_starred.xml

+34 −29

Original line number	Diff line number	Diff line
		@@ -15,10 +15,13 @@
		-->
		<view
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.contacts.list.ContactTileStarredView"
		style="@style/ContactTileStarred" >
		android:background="@null"
		android:paddingBottom="1dip"
		android:paddingRight="1dip"
		class="com.android.contacts.list.ContactTileStarredView" >

		<RelativeLayout
		android:id="@+id/contact_tile_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent" >

		@@ -28,40 +31,42 @@
		android:layout_height="match_parent"
		android:scaleType="centerCrop" />

		<View
		android:id="@+id/contact_tile_background"
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:orientation="vertical"
		android:background="@color/contact_tile_shadow_box_color"
		android:layout_alignParentBottom="true"
		style="@style/ContactTileStarredShadowBox" />

		<ImageView
		android:id="@+id/contact_tile_presence"
		android:layout_width="16dip"
		android:layout_height="16dip"
		android:layout_alignParentBottom="true"
		android:layout_marginLeft="8dip"
		android:layout_marginBottom="10dip" />
		android:gravity="center_vertical"
		android:paddingRight="8dip"
		android:paddingLeft="8dip">

		<TextView
		android:id="@+id/contact_tile_name"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignLeft="@id/contact_tile_presence"
		android:layout_above="@id/contact_tile_presence"
		android:textColor="@android:color/white"
		stlye="@style/ContactTileStarredName" />
		android:textSize="16sp"
		android:singleLine="true"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		<TextView
		android:id="@+id/contact_tile_status"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/contact_tile_presence"
		android:layout_below="@id/contact_tile_name"
		android:layout_marginLeft="4dip"
		style="@style/ContactTileStatusText" />
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="@color/people_contact_tile_status_color"
		android:singleLine="true"
		android:drawablePadding="4dip"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		<ImageButton
		</LinearLayout>

		<View
		android:id="@+id/contact_tile_push_state"
		android:layout_width="match_parent"
		android:layout_height="match_parent"

res/layout/contact_tile_starred_quick_contact.xml

+40 −30

Original line number	Diff line number	Diff line
		@@ -15,51 +15,61 @@
		-->
		<view
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.contacts.list.ContactTileStarredView"
		style="@style/ContactTileStarred" >
		android:paddingBottom="1dip"
		android:paddingRight="1dip"
		android:background="@null"
		class="com.android.contacts.list.ContactTileStarredView" >

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent" >

		<QuickContactBadge
		android:id="@+id/contact_tile_quick"
		<ImageView
		android:id="@+id/contact_tile_image"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop" />

		<View
		android:id="@+id/contact_tile_background"
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:orientation="vertical"
		android:background="@color/contact_tile_shadow_box_color"
		android:layout_alignParentBottom="true"
		style="@style/ContactTileStarredShadowBox" />

		<ImageView
		android:id="@+id/contact_tile_presence"
		android:layout_width="16dip"
		android:layout_height="16dip"
		android:layout_alignParentBottom="true"
		android:layout_marginLeft="8dip"
		android:layout_marginBottom="10dip" />
		android:gravity="center_vertical"
		android:paddingRight="8dip"
		android:paddingLeft="8dip">

		<TextView
		android:id="@+id/contact_tile_name"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignLeft="@id/contact_tile_presence"
		android:layout_above="@id/contact_tile_presence"
		android:textColor="@android:color/white"
		stlye="@style/ContactTileStarredName" />
		android:textSize="16sp"
		android:singleLine="true"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		<TextView
		android:id="@+id/contact_tile_status"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toRightOf="@id/contact_tile_presence"
		android:layout_below="@id/contact_tile_name"
		android:layout_marginLeft="4dip"
		style="@style/ContactTileStatusText" />
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="@color/people_contact_tile_status_color"
		android:singleLine="true"
		android:drawablePadding="4dip"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		</LinearLayout>

		<QuickContactBadge
		android:id="@+id/contact_tile_quick"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@null" />

		</RelativeLayout>

res/layout/contact_tile_starred_secondary_target.xml

+19 −56

Original line number	Diff line number	Diff line
		@@ -15,8 +15,10 @@
		-->
		<view
		xmlns:android="http://schemas.android.com/apk/res/android"
		class="com.android.contacts.list.ContactTileSecondaryTargetView"
		style="@style/ContactTileStarred" >
		android:background="@null"
		android:paddingBottom="1dip"
		android:paddingRight="1dip"
		class="com.android.contacts.list.ContactTileSecondaryTargetView" >

		<RelativeLayout
		android:layout_width="match_parent"
		@@ -28,49 +30,24 @@
		android:layout_height="match_parent"
		android:scaleType="centerCrop" />

		<View
		android:id="@+id/contact_tile_background"
		android:layout_width="match_parent"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:layout_alignParentBottom="true"
		android:layout_alignParentLeft="true"
		style="@style/ContactTileStarredShadowBox" />

		<FrameLayout
		android:id="@+id/contact_tile_info_layout"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:layout_width="wrap_content"
		android:orientation="horizontal"
		android:layout_alignParentBottom="true"
		android:layout_alignParentLeft="true"
		android:layout_marginLeft="8dip"
		android:layout_marginRight="45dip">

		<TextView
		android:id="@+id/contact_tile_name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_width="match_parent"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:background="@color/contact_tile_shadow_box_color"
		android:gravity="center_vertical"
		android:textColor="@android:color/white"
		android:singleLine="true"
		android:textSize="16sp"
		android:fadingEdge="horizontal"
		android:fadingEdgeLength="3dip"
		android:ellipsize="marquee" />

		</FrameLayout>

		<View
		android:id="@+id/secondary_vertical_divider"
		android:layout_width="1dip"
		android:layout_height="32dip"
		android:ellipsize="marquee"
		android:layout_alignParentBottom="true"
		android:layout_alignParentRight="true"
		android:layout_marginRight="44dip"
		android:layout_marginBottom="8dip"
		android:background="@drawable/ic_divider_dashed_holo_dark" />
		android:paddingLeft="8dip"
		android:paddingRight="47dip"
		android:drawableRight="@drawable/ic_divider_dashed_holo_dark" />

		<ImageButton
		<View
		android:id="@+id/contact_tile_push_state"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -82,25 +59,11 @@
		android:background="?android:attr/selectableItemBackground"
		android:layout_height="@dimen/contact_tile_shadowbox_height"
		android:layout_width="48dip"
		android:layout_alignParentBottom="true"
		android:layout_alignParentRight="true"
		android:paddingRight="8dip"
		android:paddingLeft="8dip" />

		<View
		android:id="@+id/contact_tile_vertical_divider"
		android:layout_height="match_parent"
		android:layout_width="2dip"
		android:background="@color/phone_contact_tile_divider_color"
		android:paddingLeft="8dip"
		android:layout_alignParentBottom="true"
		android:layout_alignParentRight="true" />

		<View
		android:id="@+id/contact_tile_horizontal_divider"
		android:layout_width="match_parent"
		android:layout_height="2dip"
		android:background="@color/phone_contact_tile_divider_color"
		android:layout_alignParentBottom="true" />

		</RelativeLayout>

		</view>