Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76631f3a authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Update of accessibility settings"

parents 3a79bad4 ea5a50a7

res/layout/text_description_preference.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/message_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical" >

res/values/strings.xml

+25 −13
Original line number Diff line number Diff line
@@ -2718,38 +2718,49 @@ found in the list of installed applications.</string> 
    <!-- Summary for the allowed state of script injection. [CHAR LIMIT=15] -->

    <string name="accessibility_script_injection_allowed">Allowed</string>

    <!-- Summary for the disallowed state of script injection. [CHAR LIMIT=15] -->

    <string name="accessibility_script_injection_disallowed">Disallowed</string>

    <string name="accessibility_script_injection_disallowed">Not allowed</string>



    <!-- Title for the dialog button to allow script injection. [CHAR LIMIT=15] -->

    <string name="accessibility_script_injection_button_allow">Allow</string>

    <!-- Title for the dialog button to disallow script injection. [CHAR LIMIT=15] -->

    <string name="accessibility_script_injection_button_disallow">Don\'t Allow</string>



    <!-- Warning message about security implications of enabling an accessibility service,

     <!-- Title for a warning message about security implications of enabling an accessibility service,

         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_security_warning">

    <string name="accessibility_service_security_warning_title">Use

         <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>

    <!-- Summary for a warning message about security implications of enabling an accessibility service,

         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_security_warning_summary">

            <xliff:g id="accessibility_service_name">%1$s</xliff:g> can

            collect all of the text you type, except passwords. This includes personal data such as credit card

            numbers. It can also collect data about your interactions with the device.</string>

    <!-- Title for a warning about disabling accessibility displayed as a dialog message when the user

         selects to disable accessibility. This avoids accidental disabling. [CHAR LIMIT=30] -->

    <string name="accessibility_disable_warning_title">Turn accessibility off?</string>

    <!-- Summary for a warning about disabling accessibility displayed as a dialog message when the user

         selects to disable accessibility. This avoids accidental disabling. [CHAR LIMIT=NONE] -->

    <string name="accessibility_disable_warning_summary">Touching OK will stop spoken

        descriptions and all other accessibility features you\'ve been using.</string>



    <!-- Title for a warning about disabling an accessibility service displayed as a dialog message when the user

         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_disable_warning_title">Stop

         <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>

    <!-- Summary for a warning about disabling accessibility service displayed as a dialog message when the user

         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_disable_warning_summary">Touching OK will

        stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>



    <!-- Title for the prompt that lets users know that they have no accessibility related apps

         installed and that they can install TalkBack from Market. [CHAR LIMIT=50] -->

    <string name="accessibility_service_no_apps_title">No accessibility applications

        </string>

    <string name="accessibility_service_no_apps_title">No accessibility applications</string>

    <!-- Message for the prompt that lets users know that they have no accessibility related apps

         installed and that they can install TalkBack from Market. [CHAR LIMIT=NONE] -->

    <string name="accessibility_service_no_apps_message">You don\'t have accessibility

        applications installed. Do you want to download a screen reader from the Android Market?</string>



    <!-- Title for a warning about downloading accessibility scripts displayed as a dialog message

         when the user selects to enable script downloading. [CHAR LIMIT=40] -->

    <string name="accessibility_script_injection_security_warning_title">Install accessibility scripts?</string>

    <!-- Warning message about security implications of downloading accessibility scripts,

         displayed as a dialog message when the user selects to enable script downloading. [CHAR LIMIT=NONE] -->

    <string name="accessibility_script_injection_security_warning">Do you want applications to install

    <string name="accessibility_script_injection_security_warning_summary">Do you want applications to install

        scripts from Google that will make their content more accessible?</string>



    <!-- Warning message that the interaction model changes on enabling touch exploration. [CHAR LIMIT=NONE] -->

    <string name="accessibility_touch_exploration_warning">This feature changes the

        way your device responds to touch. Turn on?</string>
@@ -2757,6 +2768,7 @@ found in the list of installed applications.</string> 
    <string name="accessibility_service_default_description">This accessibility service has no

        description.\n\nAccessibility services provide various types of feedback when you interact

        with the device. </string>



    <!-- Accessibility settings: button for lauching settings for an accessibility service -->

    <string name="settings_button">Settings</string>

res/xml/accessibility_settings.xml

+13 −8
Original line number Diff line number Diff line
@@ -30,13 +30,17 @@ 
        <CheckBoxPreference

                android:key="toggle_large_text_preference"

                android:title="@string/accessibility_toggle_large_text_title"

                android:persistent="true"/>

                android:persistent="false"/>



        <CheckBoxPreference

                android:key="toggle_power_button_ends_call_preference"

                android:title="@string/accessibility_power_button_ends_call_title"

                android:persistent="true">

        </CheckBoxPreference>

                android:persistent="false"/>



        <CheckBoxPreference

                android:key="toggle_auto_rotate_screen_preference"

                android:title="@string/accelerometer_title"

                android:persistent="false"/>



        <PreferenceScreen

                android:key="toggle_touch_exploration_preference"
@@ -44,7 +48,8 @@ 
                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="warning_message" android:value="@string/accessibility_touch_exploration_warning" />

                <extra android:name="enable_warning_title" android:value="@android:string/dialog_alert_title" />

                <extra android:name="enable_warning_message" android:value="@string/accessibility_touch_exploration_warning" />

                <extra android:name="settings_title" android:value="@string/accessibility_menu_item_tutorial" />

                <extra android:name="settings_component_name" android:value="com.android.settings/com.android.settings.AccessibilityTutorialActivity" />

        </PreferenceScreen>
@@ -53,17 +58,17 @@ 
                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="true" />

                android:persistent="false"/>



        <com.android.settings.AccessibilityEnableScriptInjectionPreference

                android:key="toggle_script_injection_preference"

                android:title="@string/accessibility_script_injection_title"

                android:dialogTitle="@android:string/dialog_alert_title"

                android:dialogTitle="@string/accessibility_script_injection_security_warning_title"

                android:dialogIcon="@android:drawable/ic_dialog_alert"

                android:dialogMessage="@string/accessibility_script_injection_security_warning"

                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="true" />

                android:persistent="false"/>



    </PreferenceCategory>

src/com/android/settings/AccessibilitySettings.java

+154 −205

File changed.

Preview size limit exceeded, changes collapsed.