Merge "Adjust scrollbars in contact details" into jb-dev (1db10c11) · Commits · e / os / android_packages_apps_Contacts

res/layout-sw580dp-w940dp/contact_detail_fragment.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,7 @@
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/background_primary"
		android:paddingRight="16dip">
		android:background="@color/background_primary">

		<!-- Placeholder for empty list -->
		<include
		@@ -51,7 +50,9 @@
		android:clipToPadding="false"
		android:fadingEdge="none"
		android:layout_weight="1"
		android:divider="@null"/>
		android:divider="@null"
		android:scrollbarStyle="outsideOverlay"
		android:paddingRight="16dip"/>

		</LinearLayout>

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,4 +24,5 @@
		android:paddingTop="@dimen/contact_detail_list_top_padding"
		android:paddingLeft="16dip"
		android:paddingRight="16dip"
		android:scrollbarStyle="outsideOverlay"
		android:clipToPadding="false"/>

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,8 @@
		android:fadingEdge="none"
		android:cacheColorHint="#00000000"
		android:divider="@null"
		/>
		android:scrollbarStyle="outsideOverlay"
		android:paddingRight="12dip" />

		<!-- "QuickFix"- button (Copy to local contact, add to group) -->
		<Button

+3 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fadingEdge="none"
		android:divider="@null"/>
		android:divider="@null"
		android:scrollbarStyle="outsideOverlay"
		android:paddingRight="12dip" />

		</FrameLayout>

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		class="com.android.contacts.widget.ProportionalLayout"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingBottom="8dip"
		android:layout_marginBottom="8dip"
		ex:ratio="0.6667"
		ex:direction="widthToHeight">