diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-03 07:07:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 07:07:33 -0800 |
commit | 87f445c8b28c59e787e5fbfc7ba223e112d2263f (patch) | |
tree | a0d55fb1fec951ccbf5d4672c1ce78d06cdb1c3c /src/com | |
parent | 16fa074d824ed64c02e8ac3bca6cc7eaab6db509 (diff) | |
parent | c924cacfab4144eefdf8e46dfc82d79cb15e9c96 (diff) | |
download | android_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.tar.gz android_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.tar.bz2 android_packages_apps_Trebuchet-87f445c8b28c59e787e5fbfc7ba223e112d2263f.zip |
am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf
* commit 'c924cacfab4144eefdf8e46dfc82d79cb15e9c96':
Only import workspaces for non-tablets (where grid hasn't changed)
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) { |