Merge "Adjust scrollbars in contact details" into jb-dev
diff --git a/res/layout-sw580dp-w940dp/contact_detail_fragment.xml b/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
index cf89727..9f32584 100644
--- a/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
@@ -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>
diff --git a/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml b/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
index 3bcce3f..3b4b422 100644
--- a/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
@@ -24,4 +24,5 @@
android:paddingTop="@dimen/contact_detail_list_top_padding"
android:paddingLeft="16dip"
android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"
android:clipToPadding="false"/>
diff --git a/res/layout-sw580dp/contact_detail_fragment.xml b/res/layout-sw580dp/contact_detail_fragment.xml
index 32b7cbb..fd6390e 100644
--- a/res/layout-sw580dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp/contact_detail_fragment.xml
@@ -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
diff --git a/res/layout-sw580dp/contact_detail_updates_fragment.xml b/res/layout-sw580dp/contact_detail_updates_fragment.xml
index d231dbc..a154936 100644
--- a/res/layout-sw580dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw580dp/contact_detail_updates_fragment.xml
@@ -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>
diff --git a/res/layout-sw580dp/updates_header_contact.xml b/res/layout-sw580dp/updates_header_contact.xml
index cb55a2d..b8b3278 100644
--- a/res/layout-sw580dp/updates_header_contact.xml
+++ b/res/layout-sw580dp/updates_header_contact.xml
@@ -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">
diff --git a/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml b/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
index e1a870a..b3f13a6 100644
--- a/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
+++ b/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
@@ -21,8 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_primary"
- android:paddingLeft="16dip"
- android:paddingRight="16dip">
+ android:paddingLeft="16dip">
<!-- Placeholder for empty list -->
<include
@@ -52,7 +51,9 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:layout_weight="1"
- android:divider="@null"/>
+ android:divider="@null"
+ android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"/>
</LinearLayout>
diff --git a/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml b/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
index 439b8f0..d809258 100644
--- a/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
@@ -24,4 +24,5 @@
android:paddingTop="@dimen/contact_detail_list_top_padding"
android:paddingLeft="16dip"
android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"
android:clipToPadding="false"/>
diff --git a/res/layout-sw680dp/contact_detail_fragment.xml b/res/layout-sw680dp/contact_detail_fragment.xml
index 3e4d255..4c6315e 100644
--- a/res/layout-sw680dp/contact_detail_fragment.xml
+++ b/res/layout-sw680dp/contact_detail_fragment.xml
@@ -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
diff --git a/res/layout-sw680dp/contact_detail_updates_fragment.xml b/res/layout-sw680dp/contact_detail_updates_fragment.xml
index 03a2e41..a2d1abb 100644
--- a/res/layout-sw680dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw680dp/contact_detail_updates_fragment.xml
@@ -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>
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 1322e6b..c91f493 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -298,7 +298,6 @@
mPhotoTouchOverlay = mView.findViewById(R.id.photo_touch_intercept_overlay);
mListView = (ListView) mView.findViewById(android.R.id.list);
- mListView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
mListView.setOnItemClickListener(this);
mListView.setItemsCanFocus(true);
mListView.setOnScrollListener(mVerticalScrollListener);