diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-17 11:24:31 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-17 11:24:46 -0800 |
| commit | d896ee43cd9195a2a2742324733b036ee72875bb (patch) | |
| tree | cb99b7485b4d01b0f4a1355072be51d1a740cc05 /src/com/android/launcher3/IconCache.java | |
| parent | 2b84b652b33977d82e0af4ab9fdc7a97cb8d5a33 (diff) | |
| download | android_packages_apps_Trebuchet-d896ee43cd9195a2a2742324733b036ee72875bb.tar.gz android_packages_apps_Trebuchet-d896ee43cd9195a2a2742324733b036ee72875bb.tar.bz2 android_packages_apps_Trebuchet-d896ee43cd9195a2a2742324733b036ee72875bb.zip | |
Protecting Icon normalization behind a feature flag
Change-Id: I91b7126765049372a3ffec3ad6f661715dc83bab
Diffstat (limited to 'src/com/android/launcher3/IconCache.java')
| -rw-r--r-- | src/com/android/launcher3/IconCache.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index a77332fd6..101613752 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; @@ -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 |