diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-03-03 13:19:24 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-03-03 13:30:57 -0800 |
| commit | 531cda693d07eba9dce6b793848749acaf28c0fd (patch) | |
| tree | f364905e3cfc178acc95265f204b4df6e4a4efa6 | |
| parent | 935ef4226845db24e8017c3e41d70faafaa7f3cc (diff) | |
| download | android_packages_apps_Trebuchet-531cda693d07eba9dce6b793848749acaf28c0fd.tar.gz android_packages_apps_Trebuchet-531cda693d07eba9dce6b793848749acaf28c0fd.tar.bz2 android_packages_apps_Trebuchet-531cda693d07eba9dce6b793848749acaf28c0fd.zip | |
Using a negative flag for icon notmalization
Change-Id: Iaa94aea730d2b5cc3f15f3578f240127ca0eef63
| -rw-r--r-- | src/com/android/launcher3/IconCache.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/config/FeatureFlags.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/folder/Folder.java | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index d39ae661e..f5fcf4761 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -803,7 +803,7 @@ public class IconCache { private final static int DB_VERSION = 7; private final static int RELEASE_VERSION = DB_VERSION + - (FeatureFlags.LAUNCHER3_ICON_NORMALIZATION ? 1 : 0); + (FeatureFlags.LAUNCHER3_DISABLE_ICON_NORMALIZATION ? 0 : 1); private final static String TABLE_NAME = "icons"; private final static String COLUMN_ROWID = "rowid"; diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index d7a8a4e62..ee25e8164 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -223,8 +223,8 @@ public final class Utilities { @TargetApi(Build.VERSION_CODES.LOLLIPOP) public static Bitmap createBadgedIconBitmap( Drawable icon, UserHandleCompat user, Context context) { - float scale = FeatureFlags.LAUNCHER3_ICON_NORMALIZATION ? - IconNormalizer.getInstance().getScale(icon) : 1; + float scale = FeatureFlags.LAUNCHER3_DISABLE_ICON_NORMALIZATION ? + 1 : IconNormalizer.getInstance().getScale(icon); Bitmap bitmap = createIconBitmap(icon, context, scale); if (Utilities.ATLEAST_LOLLIPOP && user != null && !UserHandleCompat.myUserHandle().equals(user)) { diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 2b3727a8a..386ca447d 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -32,8 +32,8 @@ public final class FeatureFlags { // Custom flags go below this // As opposed to the new spring-loaded workspace. + public static boolean LAUNCHER3_DISABLE_ICON_NORMALIZATION = false; public static boolean LAUNCHER3_LEGACY_WORKSPACE_DND = false; - public static boolean LAUNCHER3_ICON_NORMALIZATION = true; public static boolean LAUNCHER3_LEGACY_FOLDER_ICON = false; public static boolean LAUNCHER3_LEGACY_LOGGING = false; public static boolean LAUNCHER3_USE_SYSTEM_DRAG_DRIVER = false; diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index a411c481c..76140fc33 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -470,8 +470,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList @SuppressLint("InflateParams") static Folder fromXml(Launcher launcher) { return (Folder) launcher.getLayoutInflater().inflate( - FeatureFlags.LAUNCHER3_ICON_NORMALIZATION - ? R.layout.user_folder_icon_normalized : R.layout.user_folder, null); + FeatureFlags.LAUNCHER3_DISABLE_ICON_NORMALIZATION + ? R.layout.user_folder : R.layout.user_folder_icon_normalized, null); } /** |