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

Merge "Search - add support for saving the UserId in the Index - part 2"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-10 19:24:03 +00:00
committed by Android (Google) Code Review
parent c8f0e7cf47 957ccf30b9
commit 0a3931d8fe
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID;
@@ -103,6 +104,7 @@ public class Index {
public static final int COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS = 11; public static final int COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS = 11;
public static final int COLUMN_INDEX_ENABLED = 12; public static final int COLUMN_INDEX_ENABLED = 12;
public static final int COLUMN_INDEX_KEY = 13; public static final int COLUMN_INDEX_KEY = 13;
public static final int COLUMN_INDEX_USER_ID = 14;
public static final String ENTRIES_SEPARATOR = "|"; public static final String ENTRIES_SEPARATOR = "|";
@@ -609,6 +611,7 @@ public class Index {
COLUMN_INDEX_RAW_INTENT_TARGET_CLASS); COLUMN_INDEX_RAW_INTENT_TARGET_CLASS);
final String key = cursor.getString(COLUMN_INDEX_RAW_KEY); final String key = cursor.getString(COLUMN_INDEX_RAW_KEY);
final int userId = cursor.getInt(COLUMN_INDEX_RAW_USER_ID);
SearchIndexableRaw data = new SearchIndexableRaw(packageContext); SearchIndexableRaw data = new SearchIndexableRaw(packageContext);
data.rank = rank; data.rank = rank;
@@ -625,6 +628,7 @@ public class Index {
data.intentTargetPackage = targetPackage; data.intentTargetPackage = targetPackage;
data.intentTargetClass = targetClass; data.intentTargetClass = targetClass;
data.key = key; data.key = key;
data.userId = userId;
addIndexableData(data); addIndexableData(data);
} }