commit 06780e754a7bd7a22f3f64c57eebb3592133ff2b
author Adam Cohen <adamcohen@google.com> Mon Mar 21 22:28:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 21 22:28:24 2016 +0000
tree beb652c1f33b5c3f723a1e732d71ba3231969599
parent 79b764f6669a0c60198789e59912b697c663b00e
parent d3cc05a3a8c573986d08ee293a4bb8b4534d06b2

Account for disparity btw folder preview size and drawable size
am: d3cc05a

* commit 'd3cc05a3a8c573986d08ee293a4bb8b4534d06b2':
  Account for disparity btw folder preview size and drawable size

src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java

diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
index 68b756b..6ee02f9 100644
--- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
@@ -23,6 +23,7 @@
     private float mRadius;
     private float mIconSize;
     private boolean mIsRtl;
+    private float mBaselineIconScale;
 
     @Override
     public void init(int availableSpace, int intrinsicIconSize, boolean rtl) {
@@ -30,6 +31,7 @@
         mRadius = ITEM_RADIUS_SCALE_FACTOR * availableSpace / 2f;
         mIconSize = intrinsicIconSize;
         mIsRtl = rtl;
+        mBaselineIconScale = availableSpace / (intrinsicIconSize * 1f);
     }
 
     @Override
@@ -103,13 +105,16 @@
     }
 
     private float scaleForNumItems(int numItems) {
+        float scale = 1f;
         if (numItems <= 2) {
-            return MAX_SCALE;
+            scale = MAX_SCALE;
         } else if (numItems == 3) {
-            return (MAX_SCALE + MIN_SCALE) / 2;
+            scale = (MAX_SCALE + MIN_SCALE) / 2;
         } else {
-            return MIN_SCALE;
+            scale = MIN_SCALE;
         }
+
+        return scale * mBaselineIconScale;
     }
 
     @Override