am d0623ad7: Merge "Move some values to a place where they are easier to override"

* commit 'd0623ad7f3dd22cd9e3a8ee836d8989b6425a438':
  Move some values to a place where they are easier to override
main
Jean Chalard 2013-04-11 19:57:22 -07:00 committed by Android Git Automerger
commit 9613be01de
2 changed files with 4 additions and 7 deletions

View File

@ -20,4 +20,8 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="dictionary_pack_client_id" translatable="false">com.android.inputmethod.latin</string> <string name="dictionary_pack_client_id" translatable="false">com.android.inputmethod.latin</string>
<string name="dictionary_pack_metadata_uri" translatable="false"></string> <string name="dictionary_pack_metadata_uri" translatable="false"></string>
<string name="dictionary_pack_settings_activity">com.android.inputmethod.dictionarypack.DictionarySettingsActivity</string>
<string name="authority">com.android.inputmethod.dictionarypack.aosp</string>
<string name="default_metadata_uri"></string>
<string name="local_metadata_filename">metadata.json</string>
</resources> </resources>

View File

@ -211,11 +211,4 @@
</string-array> </string-array>
<string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string> <string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string>
<!-- dictionary pack settings -->
<string name="dictionary_pack_settings_activity">com.android.inputmethod.dictionarypack.DictionarySettingsActivity</string>
<string name="authority">com.android.inputmethod.dictionarypack.aosp</string>
<string name="default_metadata_uri"></string>
<string name="local_metadata_filename">metadata.json</string>
</resources> </resources>