diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-02 17:00:14 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:20 -0700 |
commit | 9a63659683a6055f4292020e4821da33a873b313 (patch) | |
tree | f365ecaec7af9aeaa105d9d60876d1a5c987c315 /src | |
parent | 5ac8afb534befb1317d58edf6d789730652f09af (diff) | |
download | android_packages_apps_Trebuchet-9a63659683a6055f4292020e4821da33a873b313.tar.gz android_packages_apps_Trebuchet-9a63659683a6055f4292020e4821da33a873b313.tar.bz2 android_packages_apps_Trebuchet-9a63659683a6055f4292020e4821da33a873b313.zip |
Only import workspaces for non-tablets (where grid hasn't changed)
Change-Id: I832b6259477d6325c141fddfe9b50cb05aeff8d2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 4275b514d..3cffa3465 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -298,6 +298,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"; @@ -377,7 +384,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) { |