Only import workspaces for non-tablets (where grid hasn't changed) (6dbe0494) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/LauncherProvider.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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) {