From f3db021ba5329e6ff1fe62bf5a29a22c707bf2c3 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 2 Dec 2014 17:21:23 -0800
Subject: [PATCH] Fix padding in user type selection dialog

Use preferred list item padding for the list items
and use the dialog context for creating the adapter.

Bug: 18509286
Change-Id: Ia5791a6283723a0ab458f24ec22b8890ab627657
---
 res/layout/two_line_list_item.xml             |  4 +--
 .../android/settings/users/UserSettings.java  | 30 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
index e6a7c2b410b..0567bbc23b3 100644
--- a/res/layout/two_line_list_item.xml
+++ b/res/layout/two_line_list_item.xml
@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip">
     <TextView
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index b95c3978c8d..d7923ee1e1c 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -573,20 +573,22 @@ public class UserSettings extends SettingsPreferenceFragment
                 addProfileItem.put(KEY_SUMMARY, getString(R.string.user_add_profile_item_summary));
                 data.add(addUserItem);
                 data.add(addProfileItem);
-                Dialog dlg = new AlertDialog.Builder(context)
-                        .setTitle(R.string.user_add_user_type_title)
-                        .setAdapter(new SimpleAdapter(context, data, R.layout.two_line_list_item,
-                                new String[] {KEY_TITLE, KEY_SUMMARY},
-                                new int[] {R.id.title, R.id.summary}),
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        onAddUserClicked(which == 0
-                                                ? USER_TYPE_USER
-                                                : USER_TYPE_RESTRICTED_PROFILE);
-                                    }
-                                })
-                        .create();
-                return dlg;
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                SimpleAdapter adapter = new SimpleAdapter(builder.getContext(),
+                        data, R.layout.two_line_list_item,
+                        new String[] {KEY_TITLE, KEY_SUMMARY},
+                        new int[] {R.id.title, R.id.summary});
+                builder.setTitle(R.string.user_add_user_type_title);
+                builder.setAdapter(adapter,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                onAddUserClicked(which == 0
+                                        ? USER_TYPE_USER
+                                        : USER_TYPE_RESTRICTED_PROFILE);
+                            }
+                        });
+                return builder.create();
             }
             case DIALOG_NEED_LOCKSCREEN: {
                 Dialog dlg = new AlertDialog.Builder(context)