From 06601e149e2ae3e9f2656008d481ecfb21900952 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Wed, 6 Aug 2014 11:25:39 -0700
Subject: [PATCH] Fix bug #16800261 Settings app: Device administrator screen
 padding issue

- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon

Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
---
 res/layout/device_admin_item.xml     | 3 +++
 res/layout/device_admin_settings.xml | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 102cc160349..0420bb57a6f 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -20,6 +20,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:gravity="center_vertical" >
@@ -35,6 +37,7 @@
             android:layout_width="@android:dimen/app_icon_size"
             android:layout_height="@android:dimen/app_icon_size"
             android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dip"
             android:contentDescription="@null" />
 
     </LinearLayout>
diff --git a/res/layout/device_admin_settings.xml b/res/layout/device_admin_settings.xml
index b89f48b1b76..1766138f1d1 100644
--- a/res/layout/device_admin_settings.xml
+++ b/res/layout/device_admin_settings.xml
@@ -27,8 +27,6 @@
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
-                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:scrollbarStyle="outsideOverlay"
                 android:drawSelectorOnTop="false"
                 android:fastScrollEnabled="true" />