From 8fe5d507d5c6828f3d33ab5af650051ca2ef6d3a Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 30 Jan 2018 18:10:38 -0800
Subject: [PATCH] Increase app icon size from 24dp to 32dp.

The app icon size as 24dp is too small. We'd like to increase to 32dp
based on latest UX feedback and to match Material Spec v2 wrt app icon
sizes.

Test: make RunSettingsRoboTest -j40 ROBOTEST_FILTER=AppPreferenceTest
Test: visual (Launch settings -> App & notification -> verify app icon
      size increased)
Fixes: 71767701

Change-Id: I474df72075602fc48d3123127b4f9bf350374506
---
 res/values/dimens.xml                                  |  2 +-
 .../com/android/settings/widget/AppPreferenceTest.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12193c43b34..77a95b08cc9 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="action_bar_switch_padding">16dip</dimen>
 
     <dimen name="app_icon_size">40dip</dimen>
-    <dimen name="secondary_app_icon_size">24dp</dimen>
+    <dimen name="secondary_app_icon_size">32dp</dimen>
     <dimen name="min_tap_target_size">48dp</dimen>
     <dimen name="screen_margin_sides">64dip</dimen>
     <dimen name="screen_margin_top">72dip</dimen>
diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
index d4890942c6d..6556f1c7136 100644
--- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
@@ -36,6 +36,8 @@ import org.robolectric.annotation.Config;
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AppPreferenceTest {
 
+    private static final int EXPECTED_APP_ICON_SIZE_DP = 32;
+
     private Context mContext;
     private View mRootView;
     private AppPreference mPref;
@@ -75,4 +77,12 @@ public class AppPreferenceTest {
         assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
                 .isEqualTo(View.GONE);
     }
+
+    @Test
+    public void foobar_testName() {
+        // Can't use isEquals() to compare float. Use isWithIn().of() instead.
+        assertThat(mContext.getResources().getDimension(R.dimen.secondary_app_icon_size))
+                .isWithin(0.01f)
+                .of(EXPECTED_APP_ICON_SIZE_DP);
+    }
 }