diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-03-19 08:12:50 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-03-19 08:12:50 +0000 |
| commit | 8e005f2989de98cd284f1f5210f4c9d8d658e5e7 (patch) | |
| tree | fd393df41d5d7064c17a2623c19deae29740fb4e /java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java | |
| parent | 6d90a10a343723b8613fd22d323c586ecc33b284 (diff) | |
| parent | 1061bfdb34bbcb63bf0046eec42313d264ac33fa (diff) | |
| download | latinime-8e005f2989de98cd284f1f5210f4c9d8d658e5e7.tar.gz latinime-8e005f2989de98cd284f1f5210f4c9d8d658e5e7.tar.xz latinime-8e005f2989de98cd284f1f5210f4c9d8d658e5e7.zip | |
am 1061bfdb: Break dependencies to allow offdevice tests to build
* commit '1061bfdb34bbcb63bf0046eec42313d264ac33fa':
Break dependencies to allow offdevice tests to build
Diffstat (limited to '')
| -rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java b/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java index 2da871305..77b3b8e2e 100644 --- a/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java +++ b/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java @@ -48,11 +48,8 @@ public final class DictionaryProvider extends ContentProvider { private static final String TAG = DictionaryProvider.class.getSimpleName(); public static final boolean DEBUG = false; - // Authority and URI matching for the ContentProvider protocol. - // TODO: find some way to factorize this string with the one in the resources - public static final String AUTHORITY = "com.android.inputmethod.dictionarypack.aosp"; public static final Uri CONTENT_URI = - Uri.parse(ContentResolver.SCHEME_CONTENT + "://" + AUTHORITY); + Uri.parse(ContentResolver.SCHEME_CONTENT + "://" + DictionaryPackConstants.AUTHORITY); private static final String QUERY_PARAMETER_MAY_PROMPT_USER = "mayPrompt"; private static final String QUERY_PARAMETER_TRUE = "true"; private static final String QUERY_PARAMETER_DELETE_RESULT = "result"; @@ -70,12 +67,15 @@ public final class DictionaryProvider extends ContentProvider { private static final UriMatcher sUriMatcherV2 = new UriMatcher(NO_MATCH); static { - sUriMatcherV1.addURI(AUTHORITY, "list", DICTIONARY_V1_WHOLE_LIST); - sUriMatcherV1.addURI(AUTHORITY, "*", DICTIONARY_V1_DICT_INFO); - sUriMatcherV2.addURI(AUTHORITY, "*/metadata", DICTIONARY_V2_METADATA); - sUriMatcherV2.addURI(AUTHORITY, "*/list", DICTIONARY_V2_WHOLE_LIST); - sUriMatcherV2.addURI(AUTHORITY, "*/dict/*", DICTIONARY_V2_DICT_INFO); - sUriMatcherV2.addURI(AUTHORITY, "*/datafile/*", DICTIONARY_V2_DATAFILE); + sUriMatcherV1.addURI(DictionaryPackConstants.AUTHORITY, "list", DICTIONARY_V1_WHOLE_LIST); + sUriMatcherV1.addURI(DictionaryPackConstants.AUTHORITY, "*", DICTIONARY_V1_DICT_INFO); + sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/metadata", + DICTIONARY_V2_METADATA); + sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/list", DICTIONARY_V2_WHOLE_LIST); + sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/dict/*", + DICTIONARY_V2_DICT_INFO); + sUriMatcherV2.addURI(DictionaryPackConstants.AUTHORITY, "*/datafile/*", + DICTIONARY_V2_DATAFILE); } // MIME types for dictionary and dictionary list, as required by ContentProvider contract. |