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 "Creating database without localized collators on NYC and above" into ub-launcher3-calgary

This commit is contained in:
Sunny Goyal 2016-03-17 18:40:33 +00:00 committed by Android (Google) Code Review
parent c5b31965d9 bf67f3b184
commit 1bc8fc3de2
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.util.ManagedProfileHeuristic;
import com.android.launcher3.util.NoLocaleSqliteContext;
import com.android.launcher3.util.Thunk;
import java.net.URISyntaxException;
@ -526,7 +527,8 @@ public class LauncherProvider extends ContentProvider {
private long mMaxScreenId = -1;
DatabaseHelper(Context context, LauncherProvider provider) {
super(context, LauncherFiles.LAUNCHER_DB, null, DATABASE_VERSION);
super(new NoLocaleSqliteContext(context), LauncherFiles.LAUNCHER_DB,
null, DATABASE_VERSION);
mContext = context;
mProvider = provider;
@ -556,7 +558,7 @@ public class LauncherProvider extends ContentProvider {
* Constructor used only in tests.
*/
public DatabaseHelper(Context context, LauncherProvider provider, String tableName) {
super(context, tableName, null, DATABASE_VERSION);
super(new NoLocaleSqliteContext(context), tableName, null, DATABASE_VERSION);
mContext = context;
mProvider = provider;

27
src/com/android/launcher3/util/NoLocaleSqliteContext.java Normal file
View File

@ -0,0 +1,27 @@
package com.android.launcher3.util;
import android.content.Context;
import android.content.ContextWrapper;
import android.database.DatabaseErrorHandler;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabase.CursorFactory;
/**
* A context wrapper which creates databases without support for localized collators.
*/
public class NoLocaleSqliteContext extends ContextWrapper {
// TODO: Use the flag defined in Context when the new SDK is available
private static final int MODE_NO_LOCALIZED_COLLATORS = 0x0010;
public NoLocaleSqliteContext(Context context) {
super(context);
}
@Override
public SQLiteDatabase openOrCreateDatabase(
String name, int mode, CursorFactory factory, DatabaseErrorHandler errorHandler) {
return super.openOrCreateDatabase(
name, mode | MODE_NO_LOCALIZED_COLLATORS, factory, errorHandler);
}
}

2
src/com/android/launcher3/util/SQLiteCacheHelper.java
View File

@ -98,7 +98,7 @@ public abstract class SQLiteCacheHelper {
private class MySQLiteOpenHelper extends SQLiteOpenHelper {
public MySQLiteOpenHelper(Context context, String name, int version) {
super(context, name, null, version);
super(new NoLocaleSqliteContext(context), name, null, version);
}
@Override