Adjusting margins/padding

Change-Id: I75e60dc8d893c7810c7700b577a4eec40074b225
diff --git a/res/layout-xlarge/contact_browser.xml b/res/layout-xlarge/contact_browser.xml
index 53177ce..5093efd 100644
--- a/res/layout-xlarge/contact_browser.xml
+++ b/res/layout-xlarge/contact_browser.xml
@@ -24,6 +24,7 @@
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginLeft="8dip"
         android:splitMotionEvents="true">
 
         <LinearLayout
@@ -40,7 +41,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="64dip"
+                android:layout_marginLeft="56dip"
                 android:background="#7e7e87" />
 
             <FrameLayout
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5e4e085..00f5134 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -47,5 +47,5 @@
     <dimen name="editor_min_line_item_height">48dip</dimen>
 
     <!-- Padding to be used between a visible scrollbar and the contact list -->
-    <dimen name="list_visible_scrollbar_padding">34dip</dimen>
+    <dimen name="list_visible_scrollbar_padding">56dip</dimen>
 </resources>
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 558a715..00f6d91 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -522,16 +522,18 @@
         if (mListView != null) {
             mListView.setFastScrollEnabled(hasScrollbar);
             mListView.setFastScrollAlwaysVisible(hasScrollbar);
-            mListView.setScrollBarStyle(
-                    hasScrollbar ? View.SCROLLBARS_INSIDE_INSET : View.SCROLLBARS_INSIDE_OVERLAY);
             mListView.setVerticalScrollbarPosition(mVerticalScrollbarPosition);
             int leftPadding = 0;
+            int rightPadding = 0;
             if (mVerticalScrollbarPosition == View.SCROLLBAR_POSITION_LEFT) {
                 leftPadding = mContext.getResources().getDimensionPixelOffset(
                         R.dimen.list_visible_scrollbar_padding);
+            } else if (hasScrollbar){
+                rightPadding = mContext.getResources().getDimensionPixelOffset(
+                        R.dimen.list_visible_scrollbar_padding);
             }
             mListView.setPadding(leftPadding, mListView.getPaddingTop(),
-                    mListView.getPaddingRight(), mListView.getPaddingBottom());
+                    rightPadding, mListView.getPaddingBottom());
         }
     }