am fba716c5: Merge "Separate auto correction and spellchecker configurations"

* commit 'fba716c54f2a75e5ed15f98fe77a63d6955071db':
  Separate auto correction and spellchecker configurations
main
Tadashi G. Takaoka 2013-12-01 22:38:01 -08:00 committed by Android Git Automerger
commit beb28c0836
4 changed files with 82 additions and 36 deletions

View File

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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 License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<!-- The array of auto correction threshold values. -->
<string-array name="auto_correction_threshold_values" translatable="false">
<!-- Off, When auto correction setting is Off, this value is not used. -->
<item>floatMaxValue</item>
<!-- Modest : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
<item>0.185</item>
<!-- Aggressive -->
<item>0.067</item>
<!-- Very Aggressive : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. "floatNegativeInfinity" is a special marker
string for Float.NEGATIVE_INFINITY -->
<item>floatNegativeInfinity</item>
</string-array>
<!-- The index of the auto correction threshold values array. -->
<string name="auto_correction_threshold_mode_index_off" translatable="false">0</string>
<string name="auto_correction_threshold_mode_index_modest" translatable="false">1</string>
<string name="auto_correction_threshold_mode_index_aggressive" translatable="false">2</string>
<string name="auto_correction_threshold_mode_index_very_aggressive" translatable="false">3</string>
<!-- The array of the auto correction threshold settings values. -->
<string-array name="auto_correction_threshold_mode_indexes" translatable="false">
<item>@string/auto_correction_threshold_mode_index_off</item>
<item>@string/auto_correction_threshold_mode_index_modest</item>
<item>@string/auto_correction_threshold_mode_index_aggressive</item>
<item>@string/auto_correction_threshold_mode_index_very_aggressive</item>
</string-array>
<!-- The array of the human readable auto correction threshold settings entries. -->
<string-array name="auto_correction_threshold_modes" translatable="false">
<item>@string/auto_correction_threshold_mode_off</item>
<item>@string/auto_correction_threshold_mode_modest</item>
<item>@string/auto_correction_threshold_mode_aggressive</item>
<item>@string/auto_correction_threshold_mode_very_aggressive</item>
</string-array>
</resources>

View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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 License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<!-- Threshold of the normalized score of the best suggestion for the spell checker to declare
a word to be "recommended" -->
<string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string>
</resources>

View File

@ -99,23 +99,4 @@
<fraction name="config_gesture_recognition_speed_threshold">550%</fraction>
<!-- Suppress showing key preview duration after batch input in millisecond -->
<integer name="config_suppress_key_preview_after_batch_input_duration">1000</integer>
<!--
Configuration for auto correction
-->
<string-array name="auto_correction_threshold_values" translatable="false">
<!-- Off, When auto correction setting is Off, this value is not used. -->
<item>floatMaxValue</item>
<!-- Modest : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
<item>0.185</item>
<!-- Aggressive -->
<item>0.067</item>
<!-- Very Aggressive : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. "floatNegativeInfinity" is a special marker
string for Float.NEGATIVE_INFINITY -->
<item>floatNegativeInfinity</item>
</string-array>
<!-- Threshold of the normalized score of the best suggestion for the spell checker to declare
a word to be "recommended" -->
<string name="spellchecker_recommended_threshold_value" translatable="false">0.11</string>
</resources>

View File

@ -57,23 +57,6 @@
<item>@string/prefs_suggestion_visibility_hide_name</item>
</string-array>
<string name="auto_correction_threshold_mode_index_off">0</string>
<string name="auto_correction_threshold_mode_index_modest">1</string>
<string name="auto_correction_threshold_mode_index_aggressive">2</string>
<string name="auto_correction_threshold_mode_index_very_aggressive">3</string>
<string-array name="auto_correction_threshold_mode_indexes">
<item>@string/auto_correction_threshold_mode_index_off</item>
<item>@string/auto_correction_threshold_mode_index_modest</item>
<item>@string/auto_correction_threshold_mode_index_aggressive</item>
<item>@string/auto_correction_threshold_mode_index_very_aggressive</item>
</string-array>
<string-array name="auto_correction_threshold_modes">
<item>@string/auto_correction_threshold_mode_off</item>
<item>@string/auto_correction_threshold_mode_modest</item>
<item>@string/auto_correction_threshold_mode_aggressive</item>
<item>@string/auto_correction_threshold_mode_very_aggressive</item>
</string-array>
<!-- For backward compatibility.
See {@link SettingsValues#needsToShowVoiceInputKey(SharedPreferences,Resources)} -->
<string name="voice_mode_main">0</string>