From 6b2bb39c2bbcaf0aa0b20ddc767cf0bd33c36ed4 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 28 Sep 2016 09:07:44 -0700
Subject: [PATCH] Make icon size are the same in factory reset account list.

Change-Id: I74779471a3fb7b99b515203ddba3aca6b0cd588b
Fix: 31791627
Test: Visual inspection
---
 res/layout/master_clear_account.xml       | 23 ++++++++++++++++++-----
 src/com/android/settings/MasterClear.java |  8 ++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/res/layout/master_clear_account.xml b/res/layout/master_clear_account.xml
index 4459c4793de..4a0552de873 100644
--- a/res/layout/master_clear_account.xml
+++ b/res/layout/master_clear_account.xml
@@ -14,10 +14,23 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:layout_width="wrap_content"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textSize="18sp"
-    android:drawablePadding="5dip"
-    android:gravity="center_vertical" />
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:paddingEnd="8dp"/>
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"/>
+</LinearLayout>
 
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 4f7c53a0aa8..8483114ebc9 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -37,6 +37,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -265,10 +266,9 @@ public class MasterClear extends OptionsMenuFragment {
                     icon = context.getPackageManager().getDefaultActivityIcon();
                 }
 
-                TextView child = (TextView)inflater.inflate(R.layout.master_clear_account,
-                        contents, false);
-                child.setText(account.name);
-                child.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+                View child = inflater.inflate(R.layout.master_clear_account, contents, false);
+                ((ImageView) child.findViewById(android.R.id.icon)).setImageDrawable(icon);
+                ((TextView) child.findViewById(android.R.id.title)).setText(account.name);
                 contents.addView(child);
             }
         }