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

Commit 85a5f960 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Use searchable="false" to suppress nonIndexables."

parents 241a192a 9ce4a1fc

res/xml/accessibility_magnification_settings.xml

+6 −4
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<PreferenceScreen

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

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="magnification_preference_screen_title"

                  android:title="@string/accessibility_screen_magnification_title">

    android:title="@string/accessibility_screen_magnification_title"

    settings:searchable="false">

    <Preference

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

        android:key="screen_magnification_gestures_preference_screen"

res/xml/accessibility_settings.xml

+10 −5
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ 
        <Preference

                android:key="tts_settings_preference"

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

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

                android:title="@string/tts_settings_title"

                settings:searchable="false"/>

    </PreferenceCategory>



    <PreferenceCategory
@@ -48,12 +49,14 @@ 
        <Preference

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

            android:key="font_size_preference_screen"

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

            android:title="@string/title_font_size"

            settings:searchable="false"/>



        <com.android.settings.display.ScreenZoomPreference

            android:key="accessibility_settings_screen_zoom"

            android:fragment="com.android.settings.display.ScreenZoomSettings"

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

            android:title="@string/screen_zoom_title"

            settings:searchable="false"/>



        <Preference

            android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
@@ -77,7 +80,8 @@ 
        <Preference

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

                android:key="autoclick_preference"

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

                android:title="@string/accessibility_autoclick_preference_title"

                settings:searchable="false"/>



        <SwitchPreference

                android:key="toggle_power_button_ends_call_preference"
@@ -136,7 +140,8 @@ 
                android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"

                android:key="daltonizer_preference"

                android:title="@string/accessibility_display_daltonizer_preference_title"

                android:icon="@drawable/ic_daltonizer"/>

                android:icon="@drawable/ic_daltonizer"

                settings:searchable="false"/>



        <SwitchPreference

                android:key="toggle_inversion_preference"

res/xml/configure_notification_settings.xml

+11 −8
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <com.android.settings.RestrictedListPreference

        android:key="lock_screen_notifications"

        android:title="@string/lock_screen_notifications_title"

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

        android:summary="@string/summary_placeholder"

        settings:searchable="false"/>



    <!-- Notification badging -->

    <SwitchPreference
@@ -88,13 +89,15 @@ 
    <PreferenceCategory

        android:key="lock_screen_notifications_profile_header"

        android:title="@string/profile_section_header"

        android:order="23">

        android:order="23"

        settings:searchable="false">



        <com.android.settings.RestrictedListPreference

            android:key="lock_screen_notifications_profile"

            android:title="@string/locked_work_profile_notification_title"

            android:summary="@string/summary_placeholder"

            android:order="24"/>

            android:order="24"

            settings:searchable="false"/>

    </PreferenceCategory>



</PreferenceScreen>

res/xml/connected_devices_advanced.xml

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
        android:key="bluetooth_settings"

        android:title="@string/bluetooth_settings_title"

        android:icon="@drawable/ic_settings_bluetooth"

        android:order="-9"/>

        android:order="-9"

        settings:searchable="false"/>



    <SwitchPreference

        android:key="toggle_nfc"
@@ -57,7 +58,8 @@ 
        android:summary="@string/summary_placeholder"

        android:icon="@drawable/ic_settings_print"

        android:fragment="com.android.settings.print.PrintSettingsFragment"

        android:order="-3"/>

        android:order="-3"

        settings:searchable="false"/>



    <Preference

        android:key="bt_received_files"

res/xml/display_settings.xml

+6 −4
Original line number Diff line number Diff line
@@ -37,20 +37,22 @@ 
        android:fragment="com.android.settings.display.NightDisplaySettings"

        android:widgetLayout="@null"

        settings:widgetLayout="@null"

        settings:keywords="@string/keywords_display_night_display" />

        settings:searchable="false" />



    <Preference

        android:key="auto_brightness_entry"

        android:title="@string/auto_brightness_title"

        android:summary="@string/summary_placeholder"

        android:fragment="com.android.settings.display.AutoBrightnessSettings"

        settings:searchable="false"

        settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />



    <com.android.settingslib.RestrictedPreference

        android:key="wallpaper"

        android:title="@string/wallpaper_settings_title"

        settings:keywords="@string/keywords_display_wallpaper"

        settings:useAdminDisabledSummary="true">

        settings:useAdminDisabledSummary="true"

        settings:searchable="false">

        <intent

            android:targetPackage="@string/config_wallpaper_picker_package"

            android:targetClass="@string/config_wallpaper_picker_class" />
@@ -88,7 +90,7 @@ 
        android:key="display_settings_screen_zoom"

        android:title="@string/screen_zoom_title"

        android:fragment="com.android.settings.display.ScreenZoomSettings"

        settings:keywords="@string/screen_zoom_keywords" />

        settings:searchable="false"/>



    <SwitchPreference

        android:key="show_operator_name"
@@ -99,7 +101,7 @@ 
        android:key="screensaver"

        android:title="@string/screensaver_settings_title"

        android:fragment="com.android.settings.dream.DreamSettings"

        settings:controller="com.android.settings.dream.DreamEntryPreferenceController" />

        settings:searchable="false" />



    <com.android.settingslib.RestrictedPreference

        android:key="lockscreen_from_display_settings"