openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Loading internal default layout if partner layout fails to load" into ub-now-queens

This commit is contained in:
Sunny Goyal 2014-10-28 00:15:42 +00:00 committed by Android (Google) Code Review
parent bb4ae1d26a 9d219685c5
commit 09ae4aef52
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/launcher3/LauncherProvider.java
View File

@ -322,29 +322,34 @@ public class LauncherProvider extends ContentProvider {
}
}
final boolean usingExternallyProvidedLayout = loader != null;
if (loader == null) {
loader = new DefaultLayoutParser(getContext(), mOpenHelper.mAppWidgetHost,
mOpenHelper, getContext().getResources(), getDefaultWorkspaceResourceId());
loader = getDefaultLayoutParser();
}
// Populate favorites table with initial favorites
SharedPreferences.Editor editor = sp.edit().remove(EMPTY_DATABASE_CREATED);
mOpenHelper.loadFavorites(mOpenHelper.getWritableDatabase(), loader);
editor.commit();
if ((mOpenHelper.loadFavorites(mOpenHelper.getWritableDatabase(), loader) <= 0)
&& usingExternallyProvidedLayout) {
// Unable to load external layout. Cleanup and load the internal layout.
createEmptyDB();
mOpenHelper.loadFavorites(mOpenHelper.getWritableDatabase(),
getDefaultLayoutParser());
}
sp.edit().remove(EMPTY_DATABASE_CREATED).commit();
}
}
private DefaultLayoutParser getDefaultLayoutParser() {
int defaultLayout = LauncherAppState.getInstance()
.getDynamicGrid().getDeviceProfile().defaultLayoutId;
return new DefaultLayoutParser(getContext(), mOpenHelper.mAppWidgetHost,
mOpenHelper, getContext().getResources(), defaultLayout);
}
public void migrateLauncher2Shortcuts() {
mOpenHelper.migrateLauncher2Shortcuts(mOpenHelper.getWritableDatabase(),
Uri.parse(getContext().getString(R.string.old_launcher_provider_uri)));
}
private static int getDefaultWorkspaceResourceId() {
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
return grid.defaultLayoutId;
}
private static interface ContentValuesCallback {
public void onRow(ContentValues values);
}