commit e8a930427dba2ed30f0c4629634aa84543121165
author Jeff Sharkey <jsharkey@android.com> Fri Apr 13 10:42:37 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 13 10:42:37 2012 -0700
tree 545b458ecbcfd47d301fb55af2c445e8efdfd139
parent 9ad9cf646e164b46d9ec698c9ff4469e4a95904a
parent 78a534af1b4045cdda2b21c49d1bb50c4f329d86

Merge "Handle READ_EXTERNAL enforced by default."

res/xml/accessibility_settings.xml

diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 88f6491..9e99014 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -30,32 +30,27 @@
         <CheckBoxPreference
                 android:key="toggle_large_text_preference"
                 android:title="@string/accessibility_toggle_large_text_title"
-                android:persistent="false"
-                android:order="1"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_power_button_ends_call_preference"
                 android:title="@string/accessibility_power_button_ends_call_title"
-                android:persistent="false"
-                android:order="2"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_auto_rotate_screen_preference"
                 android:title="@string/accelerometer_title"
-                android:persistent="false"
-                android:order="3"/>
+                android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_speak_password_preference"
                 android:title="@string/accessibility_speak_password_title"
-                android:persistent="false"
-                android:order="4"/>
+                android:persistent="false"/>
 
         <PreferenceScreen
                 android:key="toggle_touch_exploration_preference"
                 android:title="@string/accessibility_touch_exploration_title"
-                android:fragment="com.android.settings.AccessibilitySettings$ToggleTouchExplorationFragment"
-                android:order="5" >
+                android:fragment="com.android.settings.AccessibilitySettings$ToggleTouchExplorationFragment" >
                 <extra android:name="title" android:value="@string/accessibility_touch_exploration_title" />
                 <extra android:name="summary" android:value="@string/accessibility_touch_exploration_summary" />
                 <extra android:name="enable_warning_title" android:value="@android:string/dialog_alert_title" />
@@ -64,12 +59,15 @@
                 <extra android:name="settings_component_name" android:value="com.android.settings/com.android.settings.AccessibilityTutorialActivity" />
         </PreferenceScreen>
 
+        <PreferenceScreen android:key="tts_settings"
+                android:fragment="com.android.settings.tts.TextToSpeechSettings"
+                android:title="@string/tts_settings_title" />
+
         <ListPreference android:key="select_long_press_timeout_preference"
                 android:title="@string/accessibility_long_press_timeout_title"
                 android:entries="@array/long_press_timeout_selector_titles"
                 android:entryValues="@array/long_press_timeout_selector_values"
-                android:persistent="false"
-                android:order="6"/>
+                android:persistent="false"/>
 
         <!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. -->
         <com.android.settings.AccessibilityEnableScriptInjectionPreference
@@ -80,8 +78,7 @@
                 android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
                 android:positiveButtonText="@string/accessibility_script_injection_button_allow"
                 android:negativeButtonText="@string/accessibility_script_injection_button_disallow"
-                android:persistent="false"
-                android:order="7"/>
+                android:persistent="false"/>
 
     </PreferenceCategory>