am 2a50519e: Merge "Scroll content to edges of screen on tablet" into ics-mr1
* commit '2a50519e78476f6e8f1003168f62ee45285e6bc5':
Scroll content to edges of screen on tablet
diff --git a/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml b/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
index 1623e84..ecf8130 100644
--- a/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
@@ -22,7 +22,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_primary"
- android:padding="16dip">
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip">
<!-- Placeholder for empty list -->
<include
@@ -41,11 +42,14 @@
android:scaleType="centerCrop"
android:layout_width="@dimen/detail_contact_photo_size"
android:layout_height="@dimen/detail_contact_photo_size"
+ android:layout_marginTop="@dimen/detail_contact_photo_margin"
android:layout_marginRight="@dimen/detail_contact_photo_margin"/>
<ListView android:id="@android:id/list"
android:layout_width="0dip"
android:layout_height="match_parent"
+ android:paddingTop="16dip"
+ android:clipToPadding="false"
android:fadingEdge="none"
android:layout_weight="1"
android:divider="@null"/>
diff --git a/res/layout-sw580dp-w1000dp/people_activity.xml b/res/layout-sw580dp-w1000dp/people_activity.xml
index 32d76b8..a288ff0 100644
--- a/res/layout-sw580dp-w1000dp/people_activity.xml
+++ b/res/layout-sw580dp-w1000dp/people_activity.xml
@@ -129,7 +129,6 @@
class="com.android.contacts.list.ContactTileListFragment"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:layout_marginTop="32dip"
android:layout_marginRight="32dip"
android:layout_marginLeft="32dip"/>
diff --git a/res/layout-sw580dp/people_activity.xml b/res/layout-sw580dp/people_activity.xml
index 6c4e1b9..59a218d 100644
--- a/res/layout-sw580dp/people_activity.xml
+++ b/res/layout-sw580dp/people_activity.xml
@@ -117,7 +117,7 @@
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_weight="10"
android:background="@drawable/panel_favorites_holo_light">
<fragment
@@ -125,9 +125,8 @@
class="com.android.contacts.list.ContactTileListFragment"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:layout_marginTop="32dip"
- android:layout_marginRight="32dip"
- android:layout_marginLeft="32dip"/>
+ android:layout_marginRight="16dip"
+ android:layout_marginLeft="16dip"/>
</FrameLayout>
@@ -137,8 +136,8 @@
class="com.android.contacts.list.ContactTileFrequentFragment"
android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:layout_marginTop="32dip"
+ android:layout_weight="8"
+ android:layout_marginTop="16dip"
android:layout_marginRight="16dip"/>
</LinearLayout>
diff --git a/res/layout/contact_tile_list.xml b/res/layout/contact_tile_list.xml
index b1469f3..35c04c1 100644
--- a/res/layout/contact_tile_list.xml
+++ b/res/layout/contact_tile_list.xml
@@ -24,6 +24,8 @@
android:id="@+id/contact_tile_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingTop="@dimen/contact_tile_list_padding_top"
+ android:clipToPadding="false"
android:fadingEdge="none"
android:divider="@null" />
diff --git a/res/values-sw580dp-w1000dp/dimens.xml b/res/values-sw580dp-w1000dp/dimens.xml
index 334cc34..940e456 100644
--- a/res/values-sw580dp-w1000dp/dimens.xml
+++ b/res/values-sw580dp-w1000dp/dimens.xml
@@ -18,4 +18,5 @@
<dimen name="group_detail_side_margin">32dip</dimen>
<dimen name="detail_contact_photo_margin">16dip</dimen>
<dimen name="contact_detail_list_top_padding">32dip</dimen>
+ <dimen name="contact_tile_list_padding_top">32dip</dimen>
</resources>
diff --git a/res/values-sw580dp/dimens.xml b/res/values-sw580dp/dimens.xml
index 77315fc..8621afd 100644
--- a/res/values-sw580dp/dimens.xml
+++ b/res/values-sw580dp/dimens.xml
@@ -29,6 +29,7 @@
<dimen name="detail_update_section_item_horizontal_padding">8dip</dimen>
<dimen name="detail_update_section_item_vertical_padding">16dip</dimen>
<dimen name="search_view_width">400dip</dimen>
+ <dimen name="contact_tile_list_padding_top">16dip</dimen>
<!-- Center vertically -->
<dimen name="quick_contact_top_position">-1px</dimen>
<!-- Contact list (vertical scroll bar comes left) -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12ae918..a5843c6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -110,7 +110,6 @@
<!-- Font size used for the social status in the widget -->
<dimen name="widget_text_size_snippet">13sp</dimen>
-
<!-- Size of the shortcut icon. 0dip means: use the system default -->
<dimen name="shortcut_icon_size">0dip</dimen>
@@ -175,6 +174,9 @@
-->
<dimen name="contact_tile_shadowbox_height">48sp</dimen>
+ <!-- Top padding of the ListView in the contact tile list -->
+ <dimen name="contact_tile_list_padding_top">0dip</dimen>
+
<!-- Call Log -->
<dimen name="call_log_call_action_size">32dip</dimen>
<dimen name="call_log_call_action_width">48dip</dimen>