Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev

This commit is contained in:
Fabrice Di Meglio
2014-11-07 01:39:24 +00:00
committed by Android (Google) Code Review
4 changed files with 19 additions and 18 deletions

View File

@@ -37,6 +37,7 @@ import android.provider.SearchIndexableResource;
import android.provider.Settings;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.Indexable.SearchIndexProvider;
import java.util.ArrayList;
@@ -46,7 +47,7 @@ import java.util.List;
* Gesture lock pattern settings.
*/
public class PrivacySettings extends SettingsPreferenceFragment implements
DialogInterface.OnClickListener {
DialogInterface.OnClickListener, Indexable {
// Vendor specific
private static final String GSETTINGS_PROVIDER = "com.google.settings";

View File

@@ -666,6 +666,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
indexable.key = KEY_SPELL_CHECKERS;
indexable.title = context.getString(R.string.spellcheckers_settings_title);
indexable.screenTitle = screenTitle;
indexable.keywords = context.getString(R.string.keywords_spell_checker);
indexables.add(indexable);
// User dictionary.
@@ -682,6 +683,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
indexable.key = "keyboard_settings";
indexable.title = context.getString(R.string.keyboard_settings_category);
indexable.screenTitle = screenTitle;
indexable.keywords = context.getString(R.string.keywords_keyboard_and_ime);
indexables.add(indexable);
InputMethodSettingValuesWrapper immValues = InputMethodSettingValuesWrapper
@@ -787,6 +789,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
indexable.key = "voice_input_settings";
indexable.title = context.getString(R.string.voice_input_settings);
indexable.screenTitle = screenTitle;
indexable.keywords = context.getString(R.string.keywords_voice_input);
indexables.add(indexable);
// Text-to-speech.
@@ -796,6 +799,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
indexable.key = "tts_settings";
indexable.title = context.getString(R.string.tts_settings_title);
indexable.screenTitle = screenTitle;
indexable.keywords = context.getString(R.string.keywords_text_to_speech_output);
indexables.add(indexable);
}