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

Merge "Search - prepare for better normalization"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-05-28 23:22:54 +00:00
committed by Android (Google) Code Review
parent 5db7b07dc9 a8ac78b392
commit 62909fd0cd
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/search/Index.java
View File

@@ -914,31 +914,13 @@ public class Index {
String intentAction, String intentTargetPackage, String intentTargetClass, String intentAction, String intentTargetPackage, String intentTargetClass,
boolean enabled, String key) { boolean enabled, String key) {
String updatedTitle; String updatedTitle = normalizeHyphen(title);
if (title != null) { String updatedSummaryOn = normalizeHyphen(summaryOn);
updatedTitle = title.replaceAll(NON_BREAKING_HYPHEN, HYPHEN); String updatedSummaryOff = normalizeHyphen(summaryOff);
}
else {
updatedTitle = EMPTY;
}
String updatedSummaryOn; String normalizedTitle = normalizeString(updatedTitle);
if (summaryOn != null) { String normalizedSummaryOn = normalizeString(updatedSummaryOn);
updatedSummaryOn = summaryOn.replaceAll(NON_BREAKING_HYPHEN, HYPHEN); String normalizedSummaryOff = normalizeString(updatedSummaryOff);
} else {
updatedSummaryOn = EMPTY;
}
String updatedSummaryOff;
if (summaryOff != null) {
updatedSummaryOff = summaryOff.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
} else {
updatedSummaryOff = EMPTY;
}
String normalizedTitle = updatedTitle.replaceAll(HYPHEN, EMPTY);
String normalizedSummaryOn = updatedSummaryOn.replaceAll(HYPHEN, EMPTY);
String normalizedSummaryOff = updatedSummaryOff.replaceAll(HYPHEN, EMPTY);
updateOneRow(database, locale, updateOneRow(database, locale,
updatedTitle, normalizedTitle, updatedSummaryOn, normalizedSummaryOn, updatedTitle, normalizedTitle, updatedSummaryOn, normalizedSummaryOn,
@@ -947,6 +929,14 @@ public class Index {
rank, keywords, intentAction, intentTargetPackage, intentTargetClass, enabled, key); rank, keywords, intentAction, intentTargetPackage, intentTargetClass, enabled, key);
} }
private static String normalizeHyphen(String input) {
return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
}
private static String normalizeString(String input) {
return (input != null) ? input.replaceAll(HYPHEN, EMPTY) : EMPTY;
}
private void updateOneRow(SQLiteDatabase database, String locale, private void updateOneRow(SQLiteDatabase database, String locale,
String updatedTitle, String normalizedTitle, String updatedTitle, String normalizedTitle,
String updatedSummaryOn, String normalizedSummaryOn, String updatedSummaryOn, String normalizedSummaryOn,