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

Merge "Remove duplicates into Search results"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-03-10 23:10:23 +00:00
committed by Android (Google) Code Review
parent 3386f55caa 489362c83c
commit deb49d0f09
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/com/android/settings/indexer/Index.java
View File

@@ -68,7 +68,9 @@ public class Index {
private static final String[] MATCH_COLUMNS = { private static final String[] MATCH_COLUMNS = {
IndexColumns.DATA_TITLE, IndexColumns.DATA_TITLE,
IndexColumns.DATA_TITLE_NORMALIZED,
IndexColumns.DATA_SUMMARY, IndexColumns.DATA_SUMMARY,
IndexColumns.DATA_SUMMARY_NORMALIZED,
IndexColumns.DATA_KEYWORDS IndexColumns.DATA_KEYWORDS
}; };
@@ -280,8 +282,7 @@ public class Index {
final int outerDepth = parser.getDepth(); final int outerDepth = parser.getDepth();
final AttributeSet attrs = Xml.asAttributeSet(parser); final AttributeSet attrs = Xml.asAttributeSet(parser);
final String fragmentTitle = getData(attrs, final String fragmentTitle = getDataTitle(attrs);
com.android.internal.R.styleable.Preference, com.android.internal.R.styleable.Preference_title);
String title = getDataTitle(attrs); String title = getDataTitle(attrs);
String summary = getDataSummary(attrs); String summary = getDataSummary(attrs);
@@ -290,9 +291,7 @@ public class Index {
// Insert rows for the main PreferenceScreen node. Rewrite the data for removing // Insert rows for the main PreferenceScreen node. Rewrite the data for removing
// hyphens. // hyphens.
inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName, inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName,
fragmentTitle, iconResId, rank, keywords, NON_BREAKING_HYPHEN, EMPTY); fragmentTitle, iconResId, rank, keywords);
inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName,
fragmentTitle, iconResId, rank, keywords, NON_BREAKING_HYPHEN, HYPHEN);
while ((type = parser.next()) != XmlPullParser.END_DOCUMENT while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
&& (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
@@ -306,9 +305,7 @@ public class Index {
// Insert rows for the child nodes of PreferenceScreen // Insert rows for the child nodes of PreferenceScreen
inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName, inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName,
fragmentTitle, iconResId, rank, keywords, NON_BREAKING_HYPHEN, EMPTY); fragmentTitle, iconResId, rank, keywords);
inserOneRowWithFilteredData(database, localeStr, title, summary, fragmentName,
fragmentTitle, iconResId, rank, keywords, NON_BREAKING_HYPHEN, HYPHEN);
} }
} catch (XmlPullParserException e) { } catch (XmlPullParserException e) {
@@ -322,37 +319,47 @@ public class Index {
private void inserOneRowWithFilteredData(SQLiteDatabase database, String locale, private void inserOneRowWithFilteredData(SQLiteDatabase database, String locale,
String title, String summary, String fragmentName, String fragmentTitle, String title, String summary, String fragmentName, String fragmentTitle,
int iconResId, int rank, String keywords, String seq, String replacement) { int iconResId, int rank, String keywords) {
String updatedTitle; String updatedTitle;
String updateSummary; if (title != null) {
if (title != null && title.contains(seq)) { updatedTitle = title.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
updatedTitle = title.replaceAll(seq, replacement);
} else {
updatedTitle = title;
} }
if (summary != null && summary.contains(seq)) { else {
updateSummary = summary.replaceAll(seq, replacement); updatedTitle = EMPTY;
} else {
updateSummary = summary;
} }
String updatedSummary;
if (summary != null) {
updatedSummary = summary.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
} else {
updatedSummary = EMPTY;
}
String normalizedTitle = updatedTitle.replaceAll(HYPHEN, EMPTY);
String normalizedSummary = updatedSummary.replaceAll(HYPHEN, EMPTY);
insertOneRow(database, locale, insertOneRow(database, locale,
updatedTitle, updateSummary, updatedTitle, normalizedTitle, updatedSummary, normalizedSummary,
fragmentName, fragmentTitle, iconResId, rank, keywords); fragmentName, fragmentTitle, iconResId, rank, keywords);
} }
private void insertOneRow(SQLiteDatabase database, String locale, String title, private void insertOneRow(SQLiteDatabase database, String locale,
String summary, String fragmentName, String fragmentTitle, String updatedTitle, String normalizedTitle,
String updatedSummary, String normalizedSummary,
String fragmentName, String fragmentTitle,
int iconResId, int rank, String keywords) { int iconResId, int rank, String keywords) {
if (TextUtils.isEmpty(title)) { if (TextUtils.isEmpty(updatedTitle)) {
return; return;
} }
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(IndexColumns.LOCALE, locale); values.put(IndexColumns.LOCALE, locale);
values.put(IndexColumns.DATA_RANK, rank); values.put(IndexColumns.DATA_RANK, rank);
values.put(IndexColumns.DATA_TITLE, title); values.put(IndexColumns.DATA_TITLE, updatedTitle);
values.put(IndexColumns.DATA_SUMMARY, summary); values.put(IndexColumns.DATA_TITLE_NORMALIZED, normalizedTitle);
values.put(IndexColumns.DATA_SUMMARY, updatedSummary);
values.put(IndexColumns.DATA_SUMMARY_NORMALIZED, normalizedSummary);
values.put(IndexColumns.DATA_KEYWORDS, keywords); values.put(IndexColumns.DATA_KEYWORDS, keywords);
values.put(IndexColumns.FRAGMENT_NAME, fragmentName); values.put(IndexColumns.FRAGMENT_NAME, fragmentName);
values.put(IndexColumns.FRAGMENT_TITLE, fragmentTitle); values.put(IndexColumns.FRAGMENT_TITLE, fragmentTitle);

19
src/com/android/settings/indexer/IndexDatabaseHelper.java
View File

@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "IndexDatabaseHelper"; private static final String TAG = "IndexDatabaseHelper";
private static final String DATABASE_NAME = "search_index.db"; private static final String DATABASE_NAME = "search_index.db";
private static final int DATABASE_VERSION = 100; private static final int DATABASE_VERSION = 101;
public interface Tables { public interface Tables {
public static final String TABLE_PREFS_INDEX = "prefs_index"; public static final String TABLE_PREFS_INDEX = "prefs_index";
@@ -39,7 +39,9 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
public static final String LOCALE = "locale"; public static final String LOCALE = "locale";
public static final String DATA_RANK = "data_rank"; public static final String DATA_RANK = "data_rank";
public static final String DATA_TITLE = "data_title"; public static final String DATA_TITLE = "data_title";
public static final String DATA_TITLE_NORMALIZED = "data_title_normalized";
public static final String DATA_SUMMARY = "data_summary"; public static final String DATA_SUMMARY = "data_summary";
public static final String DATA_SUMMARY_NORMALIZED = "data_summary_normalized";
public static final String DATA_KEYWORDS = "data_keywords"; public static final String DATA_KEYWORDS = "data_keywords";
public static final String FRAGMENT_NAME = "fragment_name"; public static final String FRAGMENT_NAME = "fragment_name";
public static final String FRAGMENT_TITLE = "fragment_title"; public static final String FRAGMENT_TITLE = "fragment_title";
@@ -60,8 +62,12 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
", " + ", " +
IndexColumns.DATA_TITLE + IndexColumns.DATA_TITLE +
", " + ", " +
IndexColumns.DATA_TITLE_NORMALIZED +
", " +
IndexColumns.DATA_SUMMARY + IndexColumns.DATA_SUMMARY +
", " + ", " +
IndexColumns.DATA_SUMMARY_NORMALIZED +
", " +
IndexColumns.DATA_KEYWORDS + IndexColumns.DATA_KEYWORDS +
", " + ", " +
IndexColumns.FRAGMENT_NAME + IndexColumns.FRAGMENT_NAME +
@@ -113,6 +119,13 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
if (newVersion > 100) {
Log.w(TAG, "Detected schema version 100. " +
"Index needs to be rebuilt for schema version 101");
// We need to drop the tables and recreate them
dropTables(db);
bootstrapDB(db);
}
} }
private String getBuildVersion(SQLiteDatabase db) { private String getBuildVersion(SQLiteDatabase db) {
@@ -144,8 +157,10 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
public void onOpen(SQLiteDatabase db) { public void onOpen(SQLiteDatabase db) {
super.onOpen(db); super.onOpen(db);
Log.i(TAG, "Using schema version: " + db.getVersion());
if (!Build.VERSION.INCREMENTAL.equals(getBuildVersion(db))) { if (!Build.VERSION.INCREMENTAL.equals(getBuildVersion(db))) {
Log.w(TAG, "Index needs to be rebuilt"); Log.w(TAG, "Index needs to be rebuilt as build-version is not the same");
// We need to drop the tables and recreate them // We need to drop the tables and recreate them
dropTables(db); dropTables(db);
bootstrapDB(db); bootstrapDB(db);