From a9fbf3817acc3fba683b9b40d027c5b207df90e5 Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Fri, 30 Jun 2017 16:04:56 -0700
Subject: [PATCH] Update the max height/width attribute of the
 TwoTargetPreference icon.

Change the namespace for the icon image view to settings package.

Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix: 63666970
Test: Visual
(cherry picked from commit a990b5da04b4f5d475ff038f99d7dd908e931d63)
---
 packages/SettingsLib/res/layout/preference_two_target.xml | 5 +++--
 packages/SettingsLib/res/values/attrs.xml                 | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/res/layout/preference_two_target.xml b/packages/SettingsLib/res/layout/preference_two_target.xml
index 7000940d3720d..2309ec6f1f8d8 100644
--- a/packages/SettingsLib/res/layout/preference_two_target.xml
+++ b/packages/SettingsLib/res/layout/preference_two_target.xml
@@ -18,6 +18,7 @@
 <!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
@@ -50,8 +51,8 @@
                 android:id="@android:id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:maxWidth="48dp"
-                android:maxHeight="48dp" />
+                settings:maxWidth="48dp"
+                settings:maxHeight="48dp" />
         </LinearLayout>
 
         <RelativeLayout
diff --git a/packages/SettingsLib/res/values/attrs.xml b/packages/SettingsLib/res/values/attrs.xml
index a8a179358744c..6d852df2f907c 100644
--- a/packages/SettingsLib/res/values/attrs.xml
+++ b/packages/SettingsLib/res/values/attrs.xml
@@ -48,4 +48,9 @@
 
     <attr name="footerPreferenceStyle" format="reference" />
 
+    <declare-styleable name="PreferenceImageView">
+        <attr name="maxWidth" format="dimension" />
+        <attr name="maxHeight" format="dimension" />
+    </declare-styleable>
+
 </resources>