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

Commit 8ba1bf34 authored by Saige McVea's avatar Saige McVea Committed by Android (Google) Code Review
Browse files

Merge "Fixes string reference in SEARCH_INDEX_DATA_PROVIDER and minor changes... 

Merge "Fixes string reference in SEARCH_INDEX_DATA_PROVIDER and minor changes to UI based on UX review."
parents 94d2dece 06136275

res/values/config.xml

+32 −0
Original line number Original line Diff line number Diff line
@@ -67,4 +67,36 @@ 
    <!-- If the support features are enabled. -->

    <!-- If the support features are enabled. -->

    <bool name="config_support_enabled">false</bool>

    <bool name="config_support_enabled">false</bool>





    <!-- List containing the component names of pre-installed screen reader services. -->

    <string-array name="config_preinstalled_screen_reader_services" translatable="false">

        <!--

        <item>com.example.package.first/com.example.class.FirstService</item>

        <item>com.example.package.second/com.example.class.SecondService</item>

        -->

    </string-array>



    <!-- List containing the component names of pre-installed audio and captioning services. -->

    <string-array name="config_preinstalled_audio_and_caption_services" translatable="false">

        <!--

        <item>com.example.package.first/com.example.class.FirstService</item>

        <item>com.example.package.second/com.example.class.SecondService</item>

        -->

    </string-array>



    <!-- List containing the component names of pre-installed display services. -->

    <string-array name="config_preinstalled_display_services" translatable="false">

        <!--

        <item>com.example.package.first/com.example.class.FirstService</item>

        <item>com.example.package.second/com.example.class.SecondService</item>

        -->

    </string-array>



    <!-- List containing the component names of pre-installed interaction control services. -->

    <string-array name="config_preinstalled_interaction_control_services" translatable="false">

        <!--

        <item>com.example.package.first/com.example.class.FirstService</item>

        <item>com.example.package.second/com.example.class.SecondService</item>

        -->

    </string-array>



</resources>
 
</resources>

res/values/strings.xml

+19 −11
Original line number Original line Diff line number Diff line
@@ -3997,22 +3997,30 @@ 
    <string name="vision_settings_title">Vision Settings</string>

    <string name="vision_settings_title">Vision Settings</string>

    <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->

    <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->

    <string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>

    <string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>

    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->

    <!-- Title for the accessibility preference category of screen reader services and settings. [CHAR LIMIT=50] -->

    <string name="accessibility_services_title">Services</string>

    <string name="screen_reader_category_title">Screen readers</string>

    <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->

    <string name="audio_and_captions_category_title">Audio &amp; on-screen text</string>

    <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->

    <string name="display_category_title">Display</string>

    <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->

    <string name="interaction_control_category_title">Interaction controls</string>

    <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->

    <string name="user_installed_services_category_title">Downloaded services</string>

    <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->

    <string name="experimental_category_title">Experimental</string>

    <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->

    <!-- Title for the Talkback Accessibility Service. Displayed on the Accessibility Settings screen in Setup Wizard. [CHAR_LIMIT=25] -->

    <string name="talkback_title">Talkback</string>

    <string name="talkback_title">Talkback</string>

    <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->

    <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users and whether the service is on. [CHAR_LIMIT=none] -->

    <string name="talkback_summary">Screen reader primarily for people with blindness and low vision</string>

    <string name="talkback_summary">Screen reader primarily for people with blindness and low vision</string>

    <!-- Summary for the Select to Speak Accessibility Service. [CHAR_LIMIT=none] -->

    <!-- Summary for the Select to Speak Accessibility Service. [CHAR_LIMIT=none] -->

    <string name="select_to_speak_summary">Tap items on your screen to hear them read aloud</string>

    <string name="select_to_speak_summary">Tap items on your screen to hear them read aloud</string>

    <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->

    <string name="accessibility_system_title">System</string>

    <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->

    <string name="accessibility_display_title">Display</string>

    <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->

    <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->

    <string name="accessibility_captioning_title">Captions</string>

    <string name="accessibility_captioning_title">Captions</string>

    <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->

    <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->

    <string name="accessibility_screen_magnification_title">Magnification gesture</string>

    <string name="accessibility_screen_magnification_title">Magnification</string>

    <!-- Summary for the accessibility preference to enable screen magnification. [CHAR LIMIT=25] -->

    <string name="accessibility_preference_magnification_summary">Zoom in on screen</string>

    <!-- Short summary for Magnification gesture. Tells the user that this feature allows the user to magnify the screen by tapping 3 times. Appears in accessibility portion of setup wizard -->

    <!-- Short summary for Magnification gesture. Tells the user that this feature allows the user to magnify the screen by tapping 3 times. Appears in accessibility portion of setup wizard -->

    <string name="accessibility_screen_magnification_short_summary">Tap 3 times to zoom</string>

    <string name="accessibility_screen_magnification_short_summary">Tap 3 times to zoom</string>

    <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->

    <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
@@ -4040,7 +4048,7 @@ 
    <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->

    <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->

    <string name="accessibility_display_inversion_preference_title">Color inversion</string>

    <string name="accessibility_display_inversion_preference_title">Color inversion</string>

    <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->

    <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->

    <string name="accessibility_display_inversion_preference_subtitle">(Experimental) May affect performance</string>

    <string name="accessibility_display_inversion_preference_subtitle">May affect performance</string>

    <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->

    <!-- Title for accessibility preference for configuring feature that performs click action soon after mouse/trackpad pointer stops moving. [CHAR LIMIT=NONE] -->

    <string name="accessibility_autoclick_preference_title">Click after pointer stops moving</string>

    <string name="accessibility_autoclick_preference_title">Click after pointer stops moving</string>

    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->

    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->
@@ -4199,10 +4207,10 @@ 
    <string name="disable_service_message">Tapping OK will

    <string name="disable_service_message">Tapping OK will

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

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

















    <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->







    <!-- Title for the prompt shown as a placeholder if no accessibility services are installed. [CHAR LIMIT=50] -->











    <string name="accessibility_no_services_installed">No services installed</string>







    <string name="accessibility_no_services_installed">No services installed</string>



























    <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->







    <!-- Default description for an accessibility service if the latter doesn't provide one. [CHAR LIMIT=NONE] -->











    <string name="accessibility_service_default_description">No description provided.</string>







    <string name="accessibility_service_default_description">No description provided.</string>



























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







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









@@ -4223,7 +4231,7 @@









    <!-- Title for print service settings screen [CHAR LIMIT=25] -->







    <!-- Title for print service settings screen [CHAR LIMIT=25] -->











    <string name="print_settings_title">Print services</string>







    <string name="print_settings_title">Print services</string>



























    <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->







    <!-- Title for the prompt shown as a placeholder if no print services are installed. [CHAR LIMIT=50] -->











    <string name="print_no_services_installed">No services installed</string>







    <string name="print_no_services_installed">No services installed</string>



























    <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->







    <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->

































res/xml/accessibility_settings.xml



+65
−50




























Original line number
Original line
Diff line number
Diff line








@@ -18,24 +18,28 @@









        android:title="@string/accessibility_settings"







        android:title="@string/accessibility_settings"











        android:persistent="true">







        android:persistent="true">


































    <ListPreference














            android:key="accessibility_shortcut_preference"














            android:title="@string/accessibility_global_gesture_preference_title"/>


























    <PreferenceCategory







    <PreferenceCategory











            android:key="services_category"







            android:key="user_installed_services_category"











            android:title="@string/accessibility_services_title">







            android:title="@string/user_installed_services_category_title">











    </PreferenceCategory>







    </PreferenceCategory>































    <PreferenceCategory







    <PreferenceCategory











            android:key="system_category"







            android:key="screen_reader_category"











            android:title="@string/accessibility_system_title">







            android:title="@string/screen_reader_category_title">































        <Preference







        <Preference











            android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"







                android:key="tts_settings_preference"











            android:key="captioning_preference_screen"







                android:fragment="com.android.settings.tts.TextToSpeechSettings"











            android:title="@string/accessibility_captioning_title" />







                android:title="@string/tts_settings_title"/>














    </PreferenceCategory>































        <Preference







    <PreferenceCategory











            android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"







            android:key="display_category"











            android:key="screen_magnification_preference_screen"







            android:title="@string/display_category_title">











            android:title="@string/accessibility_screen_magnification_title"/>


































        <Preference







        <Preference











                android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"







                android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"









@@ -46,16 +50,30 @@









                android:key="screen_zoom"







                android:key="screen_zoom"











                android:title="@string/screen_zoom_title"/>







                android:title="@string/screen_zoom_title"/>


































        <Preference














                android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"














                android:key="screen_magnification_preference_screen"














                android:title="@string/accessibility_screen_magnification_title" />





























        <Preference














                android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"














                android:key="daltonizer_preference_screen"














                android:title="@string/accessibility_display_daltonizer_preference_title" />





























        <SwitchPreference














                android:key="toggle_large_pointer_icon"














                android:title="@string/accessibility_toggle_large_pointer_icon_title" />














    </PreferenceCategory>





























    <PreferenceCategory














            android:key="interaction_control_category"














            android:title="@string/interaction_control_category_title">


























        <Preference







        <Preference











                android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"







                android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"











                android:key="autoclick_preference_screen"







                android:key="autoclick_preference_screen"











                android:title="@string/accessibility_autoclick_preference_title"/>







                android:title="@string/accessibility_autoclick_preference_title"/>































        <SwitchPreference














                android:key="toggle_high_text_contrast_preference"














                android:title="@string/accessibility_toggle_high_text_contrast_preference_title"














                android:summary="@string/experimental_preference"/>





























        <SwitchPreference







        <SwitchPreference











                android:key="toggle_power_button_ends_call_preference"







                android:key="toggle_power_button_ends_call_preference"











                android:title="@string/accessibility_power_button_ends_call_prerefence_title"







                android:title="@string/accessibility_power_button_ends_call_prerefence_title"









@@ -66,9 +84,17 @@









                android:title="@string/accelerometer_title"







                android:title="@string/accelerometer_title"











                android:persistent="false"/>







                android:persistent="false"/>































        <SwitchPreference







        <ListPreference











                android:key="toggle_large_pointer_icon"







                android:key="select_long_press_timeout_preference"











                android:title="@string/accessibility_toggle_large_pointer_icon_title" />







                android:title="@string/accessibility_long_press_timeout_preference_title"














                android:entries="@array/long_press_timeout_selector_titles"














                android:entryValues="@array/long_press_timeout_selector_values"














                android:persistent="false"/>














    </PreferenceCategory>





























    <PreferenceCategory














            android:key="audio_and_captions_category"














            android:title="@string/audio_and_captions_category_title">































        <SwitchPreference







        <SwitchPreference











                android:key="toggle_master_mono"







                android:key="toggle_master_mono"









@@ -76,35 +102,24 @@









                android:summary="@string/accessibility_toggle_master_mono_summary"







                android:summary="@string/accessibility_toggle_master_mono_summary"











                android:persistent="false"/>







                android:persistent="false"/>































        <ListPreference














                android:key="accessibility_shortcut_preference"














                android:title="@string/accessibility_global_gesture_preference_title"/>





























        <Preference







        <Preference











                android:key="tts_settings_preference"







                android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"











                android:fragment="com.android.settings.tts.TextToSpeechSettings"







                android:key="captioning_preference_screen"











                android:title="@string/tts_settings_title"/>







                android:title="@string/accessibility_captioning_title" />


























        <ListPreference android:key="select_long_press_timeout_preference"














                android:title="@string/accessibility_long_press_timeout_preference_title"














                android:entries="@array/long_press_timeout_selector_titles"














                android:entryValues="@array/long_press_timeout_selector_values"














                android:persistent="false"/>





























    </PreferenceCategory>







    </PreferenceCategory>































    <PreferenceCategory







    <PreferenceCategory











        android:key="display_category"







            android:key="experimental_category"











        android:title="@string/accessibility_display_title" >







            android:title="@string/experimental_category_title">





























        <SwitchPreference














                android:key="toggle_high_text_contrast_preference"














                android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />


























        <SwitchPreference







        <SwitchPreference











                android:key="toggle_inversion_preference"







                android:key="toggle_inversion_preference"











                android:title="@string/accessibility_display_inversion_preference_title"







                android:title="@string/accessibility_display_inversion_preference_title"











                android:summary="@string/accessibility_display_inversion_preference_subtitle"







                android:summary="@string/accessibility_display_inversion_preference_subtitle"











                android:persistent="false" />







                android:persistent="false" />











        <Preference














            android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"














            android:key="daltonizer_preference_screen"














            android:title="@string/accessibility_display_daltonizer_preference_title" />














    </PreferenceCategory>







    </PreferenceCategory>


























</PreferenceScreen>






</PreferenceScreen>
























src/com/android/settings/accessibility/AccessibilitySettings.java



+105
−55


























File changed.
Preview size limit exceeded, changes collapsed.