Merge "Code cleaning for Index" into lmp-dev

This commit is contained in:
Fabrice Di Meglio
2014-07-23 22:39:10 +00:00
committed by Android (Google) Code Review

View File

@@ -165,15 +165,10 @@ public class Index {
private static final Pattern REMOVE_DIACRITICALS_PATTERN private static final Pattern REMOVE_DIACRITICALS_PATTERN
= Pattern.compile("\\p{InCombiningDiacriticalMarks}+"); = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
private final UpdateData mDataToProcess = new UpdateData();
private Context mContext;
private final String mBaseAuthority;
/** /**
* A private class to describe the update data for the Index database * A private class to describe the update data for the Index database
*/ */
private class UpdateData { private static class UpdateData {
public List<SearchIndexableData> dataToUpdate; public List<SearchIndexableData> dataToUpdate;
public List<SearchIndexableData> dataToDelete; public List<SearchIndexableData> dataToDelete;
public Map<String, List<String>> nonIndexableKeys; public Map<String, List<String>> nonIndexableKeys;
@@ -194,6 +189,11 @@ public class Index {
} }
} }
private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
private final UpdateData mDataToProcess = new UpdateData();
private Context mContext;
private final String mBaseAuthority;
/** /**
* A basic singleton * A basic singleton
*/ */