Merge "Add settings for theme, userfeedback and other settings (temporary)" (fd58877d) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/prefs.xml

+73 −80

Original line number	Diff line number	Diff line
		@@ -14,86 +14,66 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/english_ime_settings"
		android:key="english_ime_settings">

		<PreferenceCategory
		android:title="@string/general_category"
		android:key="general_settings">

		<CheckBoxPreference
		android:key="auto_cap"
		android:title="@string/auto_cap"
		android:persistent="true"
		android:defaultValue="true"
		/>

		android:defaultValue="true" />
		<CheckBoxPreference
		android:key="vibrate_on"
		android:title="@string/vibrate_on_keypress"
		android:persistent="true"
		/>

		android:persistent="true" />
		<CheckBoxPreference
		android:key="sound_on"
		android:title="@string/sound_on_keypress"
		android:defaultValue="@bool/config_default_sound_enabled"
		android:persistent="true"
		/>

		android:persistent="true" />
		<CheckBoxPreference
		android:key="popup_on"
		android:title="@string/popup_on_keypress"
		android:persistent="true"
		android:defaultValue="@bool/config_default_popup_preview"
		/>

		android:defaultValue="@bool/config_default_popup_preview" />
		<CheckBoxPreference
		android:key="recorrection_enabled"
		android:title="@string/prefs_enable_recorrection"
		android:summary="@string/prefs_enable_recorrection_summary"
		android:persistent="true"
		android:defaultValue="@bool/config_default_recorrection_enabled"
		/>

		android:defaultValue="@bool/config_default_recorrection_enabled" />
		<ListPreference
		android:key="settings_key"
		android:title="@string/prefs_settings_key"
		android:persistent="true"
		android:entryValues="@array/settings_key_modes_values"
		android:entries="@array/settings_key_modes"
		android:defaultValue="@string/settings_key_mode_auto"
		/>

		android:defaultValue="@string/settings_key_mode_auto" />
		<ListPreference
		android:key="voice_mode"
		android:title="@string/voice_input"
		android:persistent="true"
		android:entryValues="@array/voice_input_modes_values"
		android:entries="@array/voice_input_modes"
		android:defaultValue="@string/voice_mode_main"
		/>

		android:defaultValue="@string/voice_mode_main" />
		<PreferenceScreen
		android:key="subtype_settings"
		android:title="@string/language_selection_title"
		android:summary="@string/language_selection_summary" />

		</PreferenceCategory>

		<PreferenceCategory
		android:title="@string/prediction_category"
		android:key="prediction_settings">

		<CheckBoxPreference
		android:key="quick_fixes"
		android:title="@string/quick_fixes"
		android:summary="@string/quick_fixes_summary"
		android:persistent="true"
		android:defaultValue="true"
		/>

		android:defaultValue="true" />
		<ListPreference
		android:key="auto_correction_threshold"
		android:title="@string/auto_correction"
		@@ -101,9 +81,7 @@
		android:persistent="true"
		android:entryValues="@array/auto_correction_threshold_mode_indexes"
		android:entries="@array/auto_correction_threshold_modes"
		android:defaultValue="@string/auto_correction_threshold_mode_index_modest"
		/>

		android:defaultValue="@string/auto_correction_threshold_mode_index_modest" />
		<ListPreference
		android:key="show_suggestions_setting"
		android:summary="@string/prefs_show_suggestions_summary"
		@@ -111,23 +89,38 @@
		android:persistent="true"
		android:entryValues="@array/prefs_suggestion_visibility_values"
		android:entries="@array/prefs_suggestion_visibilities"
		android:defaultValue="@string/prefs_suggestion_visibility_default_value"
		/>

		android:defaultValue="@string/prefs_suggestion_visibility_default_value" />
		<CheckBoxPreference
		android:key="bigram_suggestion"
		android:title="@string/bigram_suggestion"
		android:summary="@string/bigram_suggestion_summary"
		android:persistent="true"
		android:defaultValue="true"
		/>
		android:defaultValue="true" />
		</PreferenceCategory>

		<CheckBoxPreference
		android:key="usability_study_mode"
		android:title="@string/prefs_usability_study_mode"
		android:persistent="true"
		android:defaultValue="false"
		/>

		android:defaultValue="false" />
		<CheckBoxPreference
		android:key="enable_logging"
		android:title="@string/prefs_enable_log"
		android:summary="@string/prefs_description_log"
		android:persistent="true"
		android:defaultValue="false" />
		<ListPreference
		android:key="pref_keyboard_layout_20100902"
		android:title="@string/keyboard_layout"
		android:persistent="true"
		android:entryValues="@array/keyboard_layout_modes_values"
		android:entries="@array/keyboard_layout_modes"
		android:defaultValue="@string/config_default_keyboard_theme_id" />
		<Preference
		android:title="Debug Settings"
		android:key="debug_settings">
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.inputmethod.latin"
		android:targetClass="com.android.inputmethod.latin.DebugSettings" />
		</Preference>
		</PreferenceScreen>
		No newline at end of file

java/src/com/android/inputmethod/latin/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.app.AlertDialog;
		import android.app.Dialog;
		import android.app.backup.BackupManager;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.os.Bundle;
		import android.preference.CheckBoxPreference;
		@@ -65,6 +66,7 @@ public class Settings extends PreferenceActivity
		public static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting";
		public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold";
		public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
		public static final String PREF_DEBUG_SETTINGS = "debug_settings";

		public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode";

		@@ -78,6 +80,7 @@ public class Settings extends PreferenceActivity
		private ListPreference mShowCorrectionSuggestionsPreference;
		private ListPreference mAutoCorrectionThreshold;
		private CheckBoxPreference mBigramSuggestion;
		private Preference mDebugSettingsPreference;
		private boolean mVoiceOn;

		private AlertDialog mDialog;
		@@ -115,6 +118,13 @@ public class Settings extends PreferenceActivity

		mAutoCorrectionThreshold = (ListPreference) findPreference(PREF_AUTO_CORRECTION_THRESHOLD);
		mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS);
		mDebugSettingsPreference = findPreference(PREF_DEBUG_SETTINGS);
		if (mDebugSettingsPreference != null) {
		final Intent debugSettingsIntent = new Intent(Intent.ACTION_MAIN);
		debugSettingsIntent.setClassName(getPackageName(), DebugSettings.class.getName());
		mDebugSettingsPreference.setIntent(debugSettingsIntent);
		}

		ensureConsistencyOfAutoCorrectionSettings();

		final PreferenceGroup generalSettings =