diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-17 12:31:56 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-17 12:32:54 -0800 |
| commit | 619c21e87b798736ec6140042a8af0de764f45d4 (patch) | |
| tree | 654113481617716a013c508d56f53d5620a2c725 | |
| parent | 6ef0f769397a9de34d6a6eafa1fb05a966c6e9fe (diff) | |
| parent | d896ee43cd9195a2a2742324733b036ee72875bb (diff) | |
| download | android_packages_apps_Trebuchet-619c21e87b798736ec6140042a8af0de764f45d4.tar.gz android_packages_apps_Trebuchet-619c21e87b798736ec6140042a8af0de764f45d4.tar.bz2 android_packages_apps_Trebuchet-619c21e87b798736ec6140042a8af0de764f45d4.zip | |
resolve merge conflicts of d896ee43cd to ub-launcher3-master.
Change-Id: If09db8d99e7065c08fcb81b8d97a68a2557d53d7
| -rw-r--r-- | src/com/android/launcher3/IconCache.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/config/FeatureFlags.java | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 1cf31fd8b..efb978d11 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -45,6 +45,7 @@ import com.android.launcher3.compat.LauncherActivityInfoCompat; 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 @@ public class IconCache { 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 @@ public class IconCache { 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 diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index a102203e8..91a063a92 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -61,6 +61,7 @@ import android.view.View; 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 @@ public final class Utilities { @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 diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 009866915..c16bdac42 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -32,5 +32,6 @@ public final class FeatureFlags { public static final boolean IS_RELEASE_BUILD = true; // Custom flags go below this + public static final boolean LAUNCHER3_ICON_NORMALIZATION = true; } |