aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protecting Icon normalization behind a feature flag

Browse Source 
Change-Id: I91b7126765049372a3ffec3ad6f661715dc83bab
This commit is contained in:
Sunny Goyal
2015-12-17 11:24:31 -08:00
parent 2b84b652b3
commit d896ee43cd
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/IconCache.java
View File

@@ -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;
@@ -784,6 +785,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";
@@ -796,7 +800,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

3
src/com/android/launcher3/Utilities.java
View File

@@ -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.util.IconNormalizer;
import java.io.ByteArrayOutputStream;
@@ -204,7 +205,7 @@ public final class Utilities {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public static Bitmap createBadgedIconBitmap(
Drawable icon, UserHandleCompat user, Context context) {
float scale = LauncherAppState.isDogfoodBuild() ?
float scale = FeatureFlags.LAUNCHER3_ICON_NORMALIZATION ?
IconNormalizer.getInstance().getScale(icon) : 1;
Bitmap bitmap = createIconBitmap(icon, context, scale);
if (Utilities.ATLEAST_LOLLIPOP && user != null

1
src/com/android/launcher3/config/FeatureFlags.java
View File

@@ -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;
}