PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c924cacf: Merge "Only import workspaces for non-tablets (where grid hasn\'t changed)" into jb-ub-now-jolly-elf

Browse Source 
* commit 'c924cacfab4144eefdf8e46dfc82d79cb15e9c96':
  Only import workspaces for non-tablets (where grid hasn't changed)
This commit is contained in:
Adam Cohen
2013-12-03 07:07:33 -08:00
committed by Android Git Automerger
parent 16fa074d82 c924cacfab
commit 87f445c8b2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherProvider.java
+8 -1
View File
@@ -290,6 +290,13 @@ public class LauncherProvider extends ContentProvider {
public void onRow(ContentValues values); 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 class DatabaseHelper extends SQLiteOpenHelper {
private static final String TAG_FAVORITES = "favorites"; private static final String TAG_FAVORITES = "favorites";
private static final String TAG_FAVORITE = "favorite"; private static final String TAG_FAVORITE = "favorite";
@@ -369,7 +376,7 @@ public class LauncherProvider extends ContentProvider {
sendAppWidgetResetNotify(); sendAppWidgetResetNotify();
} }
if (IMPORT_LAUNCHER2_DATABASE) { if (shouldImportLauncher2Database(mContext)) {
// Try converting the old database // Try converting the old database
ContentValuesCallback permuteScreensCb = new ContentValuesCallback() { ContentValuesCallback permuteScreensCb = new ContentValuesCallback() {
public void onRow(ContentValues values) { public void onRow(ContentValues values) {