commit 619c21e87b798736ec6140042a8af0de764f45d4
author Sunny Goyal <sunnygoyal@google.com> Thu Dec 17 12:31:56 2015 -0800
committer Sunny Goyal <sunnygoyal@google.com> Thu Dec 17 12:32:54 2015 -0800
tree 654113481617716a013c508d56f53d5620a2c725
parent 6ef0f769397a9de34d6a6eafa1fb05a966c6e9fe
parent d896ee43cd9195a2a2742324733b036ee72875bb

resolve merge conflicts of d896ee43cd to ub-launcher3-master.

Change-Id: If09db8d99e7065c08fcb81b8d97a68a2557d53d7

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 1cf31fd..efb978d 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -45,6 +45,7 @@
 import com.android.launcher3.compat.LauncherAppsCompat;
 import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.PackageItemInfo;
 import com.android.launcher3.util.ComponentKey;
 import com.android.launcher3.util.Thunk;
@@ -791,6 +792,9 @@
     private static final class IconDB extends SQLiteOpenHelper {
         private final static int DB_VERSION = 7;
 
+        private final static int RELEASE_VERSION = DB_VERSION +
+                (FeatureFlags.LAUNCHER3_ICON_NORMALIZATION ? 1 : 0);
+
         private final static String TABLE_NAME = "icons";
         private final static String COLUMN_ROWID = "rowid";
         private final static String COLUMN_COMPONENT = "componentName";
@@ -803,7 +807,7 @@
         private final static String COLUMN_SYSTEM_STATE = "system_state";
 
         public IconDB(Context context) {
-            super(context, LauncherFiles.APP_ICONS_DB, null, DB_VERSION);
+            super(context, LauncherFiles.APP_ICONS_DB, null, RELEASE_VERSION);
         }
 
         @Override

src/com/android/launcher3/Utilities.java

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index a102203..91a063a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -61,6 +61,7 @@
 import android.widget.Toast;
 
 import com.android.launcher3.compat.UserHandleCompat;
+import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.config.ProviderConfig;
 import com.android.launcher3.util.IconNormalizer;
 
@@ -216,7 +217,7 @@
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public static Bitmap createBadgedIconBitmap(
             Drawable icon, UserHandleCompat user, Context context) {
-        float scale = ProviderConfig.IS_DOGFOOD_BUILD ?
+        float scale = FeatureFlags.LAUNCHER3_ICON_NORMALIZATION ?
                 IconNormalizer.getInstance().getScale(icon) : 1;
         Bitmap bitmap = createIconBitmap(icon, context, scale);
         if (Utilities.ATLEAST_LOLLIPOP && user != null

src/com/android/launcher3/config/FeatureFlags.java

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index 0098669..c16bdac 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -32,5 +32,6 @@
     public static final boolean IS_RELEASE_BUILD = true;
 
     // Custom flags go below this
+    public static final boolean LAUNCHER3_ICON_NORMALIZATION = true;
 
 }