From e5109ce28c06f9ad4363963633e239d13a217c10 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 17 Sep 2018 16:06:23 -0700
Subject: [PATCH] Fix inconsistent icon size in app list.

Some app icons are really small. This is technically a bug in app, but
not handling it well makes settings UI look strange.

So in addition to setting a max size app icon can use, we just set that
as a only supported size (min == max == 36dp)

Change-Id: I4b3a1b83ab67be469ac74e7d4bb382ae855624d0
Fixes: 115788294
Test: visual
---
 res/layout/preference_app.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
index 6ec3db9b7ce..f0adebffefa 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_app.xml
@@ -34,12 +34,10 @@
         android:paddingEnd="8dp"
         android:paddingTop="4dp"
         android:paddingBottom="4dp">
-        <androidx.preference.internal.PreferenceImageView
+        <ImageView
             android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            settings:maxWidth="@dimen/secondary_app_icon_size"
-            settings:maxHeight="@dimen/secondary_app_icon_size" />
+            android:layout_width="@dimen/secondary_app_icon_size"
+            android:layout_height="@dimen/secondary_app_icon_size"/>
     </LinearLayout>
 
     <LinearLayout