From ac9f4af5e2637a5310003302a470b082d7e18fc8 Mon Sep 17 00:00:00 2001
From: Stephen Chen <stewchen@google.com>
Date: Fri, 3 Feb 2017 15:40:56 -0800
Subject: [PATCH] Make picker icons scale larger.

Bug: 34775322
Test: manual inspection.
Change-Id: Iaaa859874ec25a50677cb00bd963fc869c5b9649
---
 res/values/dimens.xml                             |  1 +
 .../wifi/LongPressAccessPointPreference.java      | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bc159d60ade..6b835166a48 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -204,6 +204,7 @@
 
     <!-- WiFi Preferences -->
     <dimen name="wifi_divider_height">1px</dimen>
+    <dimen name="wifi_picker_icon_size">32dp</dimen>
 
     <!-- Color picker -->
     <dimen name="color_swatch_size">16dp</dimen>
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
index 79f29ef6b10..b22e8f14956 100644
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
@@ -18,7 +18,8 @@ package com.android.settings.wifi;
 import android.app.Fragment;
 import android.content.Context;
 import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
+import android.widget.ImageView;
+import com.android.settings.R;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
 
@@ -26,12 +27,6 @@ public class LongPressAccessPointPreference extends AccessPointPreference {
 
     private final Fragment mFragment;
 
-    // Used for dummy pref.
-    public LongPressAccessPointPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mFragment = null;
-    }
-
     public LongPressAccessPointPreference(AccessPoint accessPoint, Context context,
             UserBadgeCache cache, boolean forSavedNetworks, Fragment fragment) {
         super(accessPoint, context, cache, forSavedNetworks);
@@ -52,5 +47,11 @@ public class LongPressAccessPointPreference extends AccessPointPreference {
             view.itemView.setTag(this);
             view.itemView.setLongClickable(true);
         }
+
+        ImageView iconImageView = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+        int imageSize = getContext().getResources().getDimensionPixelSize(
+                R.dimen.wifi_picker_icon_size);
+        iconImageView.setMinimumHeight(imageSize);
+        iconImageView.setMinimumWidth(imageSize);
     }
 }