diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-02 17:00:14 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-12-02 17:02:36 -0800 |
commit | 6dbe049431741a9dfa05f7eee144335e9da76281 (patch) | |
tree | 256f8cf0d35dd8b5be914ce17279d5c70d406653 /src/com | |
parent | 10a8935ef1fc8f073e276fddc85bf66513050c81 (diff) | |
download | android_packages_apps_Trebuchet-6dbe049431741a9dfa05f7eee144335e9da76281.tar.gz android_packages_apps_Trebuchet-6dbe049431741a9dfa05f7eee144335e9da76281.tar.bz2 android_packages_apps_Trebuchet-6dbe049431741a9dfa05f7eee144335e9da76281.zip |
Only import workspaces for non-tablets (where grid hasn't changed)
Change-Id: I832b6259477d6325c141fddfe9b50cb05aeff8d2
Diffstat (limited to 'src/com')
-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 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) { |