From 81a4e2f053b52e7990daa86dd2745f2636025b99 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 24 Mar 2016 17:03:25 -0700
Subject: [PATCH] Wrong layout file chosen for 6" phones.

Bug 26353161

A 7" tablet has a short side of 600dp, not long side and
the smaller 6" phones should not use the tablet layout.

Fixes the padding so that the overscroll highlight
isn't floating in the middle of the screen.

Change-Id: I1100ed907ba8184707da637204141a2b37414f91
---
 .../preference_list_content_single.xml           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
 rename core/res/res/{layout-w600dp => layout-sw600dp}/preference_list_content_single.xml (88%)

diff --git a/core/res/res/layout-w600dp/preference_list_content_single.xml b/core/res/res/layout-sw600dp/preference_list_content_single.xml
similarity index 88%
rename from core/res/res/layout-w600dp/preference_list_content_single.xml
rename to core/res/res/layout-sw600dp/preference_list_content_single.xml
index d2fa5b9424b00..88b1aa8d4d009 100644
--- a/core/res/res/layout-w600dp/preference_list_content_single.xml
+++ b/core/res/res/layout-sw600dp/preference_list_content_single.xml
@@ -33,20 +33,22 @@
             style="?attr/preferencePanelStyle"
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingStart="32dip"
-            android:paddingEnd="32dip"
-            android:paddingTop="32dip"
-            android:paddingBottom="32dip" >
+            android:layout_height="match_parent">
 
-            <ListView android:id="@android:id/list"
+            <ListView
+                android:id="@android:id/list"
                 android:layout_width="match_parent"
                 android:layout_height="0px"
                 android:layout_weight="1"
                 android:drawSelectorOnTop="false"
                 android:cacheColorHint="@android:color/transparent"
                 android:listPreferredItemHeight="48dp"
-                android:scrollbarAlwaysDrawVerticalTrack="true" />
+                android:scrollbarAlwaysDrawVerticalTrack="true"
+                android:paddingStart="32dip"
+                android:paddingEnd="32dip"
+                android:paddingTop="32dip"
+                android:paddingBottom="32dip"
+                android:clipToPadding="false"/>
 
             <FrameLayout android:id="@+id/list_footer"
                     android:layout_width="match_parent"