diff options
Diffstat (limited to 'src/com/android/inputmethod/latin/LatinIMESettings.java')
| -rw-r--r-- | src/com/android/inputmethod/latin/LatinIMESettings.java | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/com/android/inputmethod/latin/LatinIMESettings.java b/src/com/android/inputmethod/latin/LatinIMESettings.java index 97833e083..98a0af9d1 100644 --- a/src/com/android/inputmethod/latin/LatinIMESettings.java +++ b/src/com/android/inputmethod/latin/LatinIMESettings.java @@ -1,12 +1,12 @@ /* * Copyright (C) 2008-2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -33,7 +33,7 @@ import android.util.Log; import com.google.android.collect.Lists; -import com.android.inputmethod.voice.GoogleSettingsUtil; +import com.android.inputmethod.voice.SettingsUtil; import com.android.inputmethod.voice.VoiceInputLogger; import java.util.ArrayList; @@ -49,20 +49,20 @@ public class LatinIMESettings extends PreferenceActivity private static final String PREDICTION_SETTINGS_KEY = "prediction_settings"; private static final String VOICE_SETTINGS_KEY = "enable_voice_input"; private static final String VOICE_SERVER_KEY = "voice_server_url"; - + private static final String TAG = "LatinIMESettings"; - + // Dialog ids private static final int VOICE_INPUT_CONFIRM_DIALOG = 0; - + private CheckBoxPreference mQuickFixes; private CheckBoxPreference mShowSuggestions; private CheckBoxPreference mVoicePreference; - + private VoiceInputLogger mLogger; - + private boolean mOkClicked = false; - + @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -70,14 +70,14 @@ public class LatinIMESettings extends PreferenceActivity mQuickFixes = (CheckBoxPreference) findPreference(QUICK_FIXES_KEY); mShowSuggestions = (CheckBoxPreference) findPreference(SHOW_SUGGESTIONS_KEY); mVoicePreference = (CheckBoxPreference) findPreference(VOICE_SETTINGS_KEY); - + SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); prefs.registerOnSharedPreferenceChangeListener(this); - + mVoicePreference.setOnPreferenceClickListener(this); mVoicePreference.setChecked(prefs.getBoolean( VOICE_SETTINGS_KEY, getResources().getBoolean(R.bool.voice_input_default))); - + mLogger = VoiceInputLogger.getLogger(this); } @@ -95,7 +95,7 @@ public class LatinIMESettings extends PreferenceActivity || !RecognitionManager.isRecognitionAvailable(this)) { getPreferenceScreen().removePreference(mVoicePreference); } - + mVoicePreference.setChecked( getPreferenceManager().getSharedPreferences().getBoolean(VOICE_SETTINGS_KEY, true)); } @@ -123,7 +123,7 @@ public class LatinIMESettings extends PreferenceActivity } return false; } - + @Override protected Dialog onCreateDialog(int id) { switch (id) { @@ -144,13 +144,13 @@ public class LatinIMESettings extends PreferenceActivity .setTitle(R.string.voice_warning_title) .setPositiveButton(android.R.string.ok, listener) .setNegativeButton(android.R.string.cancel, listener); - + // Get the current list of supported locales and check the current locale against // that list, to decide whether to put a warning that voice input will not work in // the current language as part of the pop-up confirmation dialog. - String supportedLocalesString = GoogleSettingsUtil.getGservicesString( + String supportedLocalesString = SettingsUtil.getSettingsString( getContentResolver(), - GoogleSettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, + SettingsUtil.LATIN_IME_VOICE_INPUT_SUPPORTED_LOCALES, LatinIME.DEFAULT_VOICE_INPUT_SUPPORTED_LOCALES); ArrayList<String> voiceInputSupportedLocales = Lists.newArrayList(supportedLocalesString.split("\\s+")); @@ -167,7 +167,7 @@ public class LatinIMESettings extends PreferenceActivity getString(R.string.voice_hint_dialog_message); builder.setMessage(message); } - + AlertDialog dialog = builder.create(); dialog.setOnDismissListener(this); mLogger.settingsWarningDialogShown(); @@ -177,7 +177,7 @@ public class LatinIMESettings extends PreferenceActivity return null; } } - + public void onDismiss(DialogInterface dialog) { mLogger.settingsWarningDialogDismissed(); if (!mOkClicked) { @@ -186,7 +186,7 @@ public class LatinIMESettings extends PreferenceActivity mVoicePreference.setChecked(false); } } - + private void updateVoicePreference() { SharedPreferences.Editor editor = getPreferenceManager().getSharedPreferences().edit(); boolean isChecked = mVoicePreference.isChecked(); |