Merge "Prevent attribution/ comments from getting cut off" (3deb35da) · Commits · e / os / android_packages_apps_Contacts

res/layout-sw580dp/contact_detail_container.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:background="@color/background_primary">
		android:orientation="vertical">

		<android.support.v4.view.ViewPager
		android:id="@+id/pager"

res/layout-sw580dp/group_detail_fragment.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingLeft="@dimen/group_detail_border_padding"
		android:paddingRight="@dimen/group_detail_border_padding"
		android:background="@drawable/panel_content">
		android:paddingRight="@dimen/group_detail_border_padding">

		<TextView
		android:id="@+id/group_title"

res/layout-sw580dp/people_activity.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		android:layout_width="0dip"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:background="@color/background_primary"
		ex:clipMarginLeft="0dip"
		ex:clipMarginTop="3dip"
		ex:clipMarginRight="3dip"
		@@ -72,7 +73,10 @@
		android:id="@+id/contact_detail_container"
		layout="@layout/contact_detail_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>
		android:layout_height="match_parent"
		android:layout_marginTop="16dip"
		android:layout_marginLeft="16dip"
		android:layout_marginRight="16dip"/>

		<!-- This invisible worker fragment loads the contact's details -->
		<fragment

res/layout/stream_item_container.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		android:paddingLeft="@dimen/detail_update_section_side_padding"
		android:paddingRight="@dimen/detail_update_section_side_padding">

		<TableLayout
		<LinearLayout
		android:id="@+id/stream_item_content"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -31,6 +31,7 @@
		android:paddingBottom="@dimen/detail_update_section_item_vertical_padding"
		android:background="?android:attr/selectableItemBackground"
		android:layout_gravity="center_vertical"
		android:orientation="vertical"
		/>

		<View

res/layout/stream_item_row_image_and_text.xml

+30 −57

Original line number	Diff line number	Diff line
		@@ -14,68 +14,41 @@
		limitations under the License.
		-->

		<TableRow
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts">
		xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="8dip"
		android:orientation="horizontal"
		android:weightSum="2">

		<view
		class="com.android.contacts.widget.ProportionalLayout"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_marginRight="@dimen/detail_update_section_between_items_horizontal_padding"
		android:layout_weight="1"
		android:layout_marginRight="@dimen/detail_update_section_between_items_horizontal_padding"
		ex:ratio="1"
		ex:direction="widthToHeight">

		<include
		android:id="@+id/stream_item_first_image"
		layout="@layout/stream_item_photo"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>
		</view>

		<view
		class="com.android.contacts.widget.ProportionalLayout"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		ex:ratio="1"
		ex:direction="widthToHeight">
		<LinearLayout
		android:id="@+id/stream_item_second_text"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<TextView android:id="@+id/stream_item_html"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="16sp"
		android:textColor="?android:attr/textColorPrimary" />

		<LinearLayout
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView android:id="@+id/stream_item_attribution"
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="1"
		android:ellipsize="end"
		android:layout_weight="1" />
		</view>

		<TextView android:id="@+id/stream_item_comments"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/detail_update_section_attribution_comments_padding"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:visibility="gone"
		android:maxLines="1" />
		</LinearLayout>

		</LinearLayout>
		</view>
		<include
		android:id="@+id/stream_item_second_text"
		layout="@layout/stream_item_row_text_only"/>

		</TableRow>
		</LinearLayout>