From 6dbe049431741a9dfa05f7eee144335e9da76281 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 2 Dec 2013 17:00:14 -0800 Subject: Only import workspaces for non-tablets (where grid hasn't changed) Change-Id: I832b6259477d6325c141fddfe9b50cb05aeff8d2 --- src/com/android/launcher3/LauncherProvider.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 4eb30e746..54de63531 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -290,6 +290,13 @@ public class LauncherProvider extends ContentProvider { public void onRow(ContentValues values); } + private static boolean shouldImportLauncher2Database(Context context) { + boolean isTablet = context.getResources().getBoolean(R.bool.is_tablet); + + // We don't import the old databse for tablets, as the grid size has changed. + return !isTablet && IMPORT_LAUNCHER2_DATABASE; + } + private static class DatabaseHelper extends SQLiteOpenHelper { private static final String TAG_FAVORITES = "favorites"; private static final String TAG_FAVORITE = "favorite"; @@ -369,7 +376,7 @@ public class LauncherProvider extends ContentProvider { sendAppWidgetResetNotify(); } - if (IMPORT_LAUNCHER2_DATABASE) { + if (shouldImportLauncher2Database(mContext)) { // Try converting the old database ContentValuesCallback permuteScreensCb = new ContentValuesCallback() { public void onRow(ContentValues values) { -- cgit v1.2.3