am 05314bf0: am 4f5f81d5: Reorder advanced settings menu

* commit '05314bf0054148ec85df8620afcc9189ebca383c':
  Reorder advanced settings menu
This commit is contained in:
Tadashi G. Takaoka 2013-04-17 19:41:06 -07:00 committed by Android Git Automerger
commit 3be1c7485b

View file

@ -90,6 +90,7 @@
android:summary="@string/gesture_input_summary" android:summary="@string/gesture_input_summary"
android:persistent="true" android:persistent="true"
android:defaultValue="true" /> android:defaultValue="true" />
<!-- TODO: Move these two options to the advanced settings. -->
<CheckBoxPreference <CheckBoxPreference
android:key="pref_gesture_floating_preview_text" android:key="pref_gesture_floating_preview_text"
android:title="@string/gesture_floating_preview_text" android:title="@string/gesture_floating_preview_text"
@ -139,10 +140,6 @@
android:summary="@string/include_other_imes_in_language_switch_list_summary" android:summary="@string/include_other_imes_in_language_switch_list_summary"
android:persistent="true" android:persistent="true"
android:defaultValue="false" /> android:defaultValue="false" />
<PreferenceScreen
android:fragment="com.android.inputmethod.latin.AdditionalSubtypeSettings"
android:key="custom_input_styles"
android:title="@string/custom_input_styles_title" />
<!-- Values for popup dismiss delay are added programmatically --> <!-- Values for popup dismiss delay are added programmatically -->
<CheckBoxPreference <CheckBoxPreference
android:key="pref_sliding_key_input_preview" android:key="pref_sliding_key_input_preview"
@ -150,6 +147,10 @@
android:summary="@string/sliding_key_input_preview_summary" android:summary="@string/sliding_key_input_preview_summary"
android:persistent="true" android:persistent="true"
android:defaultValue="true" /> android:defaultValue="true" />
<PreferenceScreen
android:fragment="com.android.inputmethod.latin.AdditionalSubtypeSettings"
android:key="custom_input_styles"
android:title="@string/custom_input_styles_title" />
<ListPreference <ListPreference
android:key="pref_key_preview_popup_dismiss_delay" android:key="pref_key_preview_popup_dismiss_delay"
android:title="@string/key_preview_popup_dismiss_delay" /> android:title="@string/key_preview_popup_dismiss_delay" />