commit e7217a5329fab3a8974d9bd9b8f096ad01ffef46
author Sunny Goyal <sunnygoyal@google.com> Thu Apr 07 23:47:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 07 23:47:52 2016 +0000
tree 8a4a41a41f19594f2cb7a1c65915020906617675
parent e1a48115de7ec97d0f013151f1a2e6a24196b4fa
parent 8682116e2ddccee65abfe95f51a5509e999f6a57

Merge "Changing the scale factor for square icons" into ub-launcher3-calgary

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 9ed42f7..effecaf 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -802,7 +802,7 @@
     }
 
     private static final class IconDB extends SQLiteCacheHelper {
-        private final static int DB_VERSION = 8;
+        private final static int DB_VERSION = 9;
 
         private final static int RELEASE_VERSION = DB_VERSION +
                 (FeatureFlags.LAUNCHER3_DISABLE_ICON_NORMALIZATION ? 0 : 1);

src/com/android/launcher3/util/IconNormalizer.java

diff --git a/src/com/android/launcher3/util/IconNormalizer.java b/src/com/android/launcher3/util/IconNormalizer.java
index 001cac0..4087d7b 100644
--- a/src/com/android/launcher3/util/IconNormalizer.java
+++ b/src/com/android/launcher3/util/IconNormalizer.java
@@ -28,7 +28,7 @@
 public class IconNormalizer {
 
     // Ratio of icon visible area to full icon size for a square shaped icon
-    private static final float MAX_SQUARE_AREA_FACTOR = 359.0f / 576;
+    private static final float MAX_SQUARE_AREA_FACTOR = 375.0f / 576;
     // Ratio of icon visible area to full icon size for a circular shaped icon
     private static final float MAX_CIRCLE_AREA_FACTOR = 380.0f / 576;