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

Commit dd0e23b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add keywords for search terms" into pi-dev

parents 0aa142ff 5c5a921e
Loading
Loading
Loading
Loading
+53 −8
Original line number Diff line number Diff line
@@ -6804,16 +6804,16 @@
    </string>
    <!--Search Keywords [CHAR LIMIT=NONE]-->
    <string name="keywords_wifi">wifi, wi-fi, network connection</string>
    <string name="keywords_wifi">wifi, wi-fi, network connection, internet, wireless, data, wi fi</string>
    <string name="keywords_change_wifi_state">wifi, wi-fi, toggle, control</string>
    <string name="keywords_more_default_sms_app">text message, texting, messages, messaging</string>
    <string name="keywords_more_default_sms_app">text message, texting, messages, messaging, default</string>
    <string name="keywords_more_mobile_networks">cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte</string>
    <string name="keywords_wifi_calling">wifi, wi-fi, call, calling</string>
    <string name="keywords_home">launcher</string>
    <string name="keywords_home">launcher, default, apps</string>
    <string name="keywords_display">screen, touchscreen</string>
    <string name="keywords_display_brightness_level">dim screen, touchscreen, battery</string>
    <string name="keywords_display_brightness_level">dim screen, touchscreen, battery, bright</string>
    <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery</string>
    <string name="keywords_display_night_display">dim screen, night, tint</string>
    <string name="keywords_display_night_display">dim screen, night, tint, night shift, brightness, screen color, colour, color</string>
    <string name="keywords_display_wallpaper">background, personalize, customize display</string>
    <string name="keywords_display_font_size">text size</string>
    <string name="keywords_display_cast_screen">project, cast</string>
@@ -6824,9 +6824,9 @@
    <string name="keywords_text_to_speech_output">rate, language, default, speak, speaking, tts, accessibility, screen reader, blind</string>
    <string name="keywords_date_and_time">clock, military</string>
    <string name="keywords_network_reset">reset, restore, factory</string>
    <string name="keywords_factory_data_reset">wipe, delete, restore, clear, remove</string>
    <string name="keywords_factory_data_reset">wipe, delete, restore, clear, remove, factory reset</string>
    <string name="keywords_printing">printer</string>
    <string name="keywords_sounds">speaker beep</string>
    <string name="keywords_sounds">speaker beep, speaker, volume, mute, silence, audio, music</string>
    <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb, interrupt, interruption, break</string>
    <string name="keywords_app">RAM</string>
    <string name="keywords_location">nearby, location, history, reporting</string>
@@ -6841,7 +6841,7 @@
    <string name="keywords_default_apps">apps, default</string>
    <string name="keywords_ignore_optimizations">ignore optimizations, doze, app standby</string>
    <string name="keywords_color_mode">vibrant, RGB, sRGB, color, natural, standard</string>
    <string name="keywords_color_temperature">color temperature D65 D73 white yellow blue warm cool</string>
    <string name="keywords_color_temperature">color, temperature, D65, D73, white, yellow, blue, warm, cool</string>
    <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
    <string name="keywords_profile_challenge">work challenge, work, profile</string>
    <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
@@ -6858,6 +6858,51 @@
    <!-- Search keyword for fingerprint settings. -->
    <string name="keywords_fingerprint_settings">fingerprint</string>
    <!-- List of synonyms for the auto rotate (rotate the virtual display when the device rotates) setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_auto_rotate">rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal</string>
    <!-- List of synonyms for the System Update (update the operating system) setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_system_update_settings">upgrade, android</string>
    <!-- List of synonyms for the Do Not Disturb setting, used to match in settings search. Do Not Disturb turns of notification volume, notifications, vibrations, among other things on the device. [CHAR LIMIT=NONE] -->
    <string name="keywords_zen_mode_settings">dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event</string>
    <!-- List of synonyms for the display timeout (how long until the screen turns off) setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_screen_timeout">screen, lock time, timeout, lockscreen</string>
    <!-- List of synonyms for Storage settings (everything related to storage on the device), used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_storage_settings">memory, data, delete, clear, free, space</string>
    <!-- List of synonyms for the Bluetooth setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_bluetooth_settings">connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media </string>
    <!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_wallpaper">background, screen, lockscreen, theme</string>
    <!-- List of synonyms for the Default Assist and Voice input setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_assist_input">default, assistant</string>
    <!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_default_browser">default, default browser</string>
    <!-- List of synonyms for the default payment app setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_default_payment_app">payment, default</string>
    <!-- List of synonyms for the default links setting, used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_default_links">default</string>
    <!-- List of synonyms for Ambient display setting (when the screen is off), used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_ambient_display">incoming notification</string>
    <!-- List of synonyms for hotspot and tethering setting (where you share your wifi with other devices), used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_hotspot_tethering">usb tether, bluetooth tether, wifi hotspot</string>
    <!-- List of synonyms for touch vibration setting (where you get a haptic response for touching things on the screen), used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_touch_vibration">haptics, vibrate, screen, sensitivity</string>
    <!-- List of synonyms for ring and notification vibration setting (changes whether your phone vibrates when it rings), used to match in settings search [CHAR LIMIT=NONE] -->
    <string name="keywords_ring_vibration">haptics, vibrate, phone, call, sensitivity</string>
    <!-- NFC Wi-Fi pairing/setup strings-->
    <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="accessibility_settings_vibration_screen"
    android:title="@string/accessibility_vibration_settings_title">

@@ -24,11 +25,13 @@
        android:fragment="com.android.settings.accessibility.NotificationVibrationPreferenceFragment"
        android:key="notification_vibration_preference_screen"
        android:title="@string/accessibility_notification_vibration_title"
        settings:keywords="@string/keywords_ring_vibration"
        app:controller="com.android.settings.accessibility.NotificationVibrationIntensityPreferenceController" />

    <Preference
        android:fragment="com.android.settings.accessibility.TouchVibrationPreferenceFragment"
        android:key="touch_vibration_preference_screen"
        android:title="@string/accessibility_touch_vibration_title"
        settings:keywords="@string/keywords_touch_vibration"
        app:controller="com.android.settings.accessibility.HapticFeedbackIntensityPreferenceController" />
</PreferenceScreen>
+8 −4
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@
    <com.android.settings.widget.AppPreference
        android:key="assist_and_voice_input"
        android:title="@string/assist_and_voice_input_title"
        android:fragment="com.android.settings.applications.assist.ManageAssist" />
        android:fragment="com.android.settings.applications.assist.ManageAssist"
        settings:keywords="@string/keywords_assist_input"/>

    <com.android.settings.widget.AppPreference
        android:key="default_browser"
        android:title="@string/default_browser_title"
        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
        settings:keywords="@string/keywords_default_browser">
        <extra android:name="for_work" android:value="false" />
    </com.android.settings.widget.AppPreference>

@@ -55,7 +57,8 @@
        android:key="default_payment_app"
        android:title="@string/nfc_payment_settings_title"
        android:summary="@string/summary_placeholder"
        android:fragment="com.android.settings.nfc.PaymentSettings" />
        android:fragment="com.android.settings.nfc.PaymentSettings"
        settings:keywords="@string/keywords_default_payment_app"/>

    <com.android.settings.widget.AppPreference
        android:key="default_emergency_app"
@@ -73,7 +76,8 @@
    <com.android.settings.widget.AppPreference
        android:key="domain_urls"
        android:title="@string/domain_urls_title"
        android:fragment="com.android.settings.applications.ManageDomainUrls" />
        android:fragment="com.android.settings.applications.ManageDomainUrls"
        settings:keywords="@string/keywords_default_links"/>

    <com.android.settings.widget.WorkOnlyCategory
        android:key="work_app_defaults"
+4 −3
Original line number Diff line number Diff line
@@ -65,11 +65,13 @@
        android:title="@string/screen_timeout"
        android:summary="@string/summary_placeholder"
        android:entries="@array/screen_timeout_entries"
        android:entryValues="@array/screen_timeout_values" />
        android:entryValues="@array/screen_timeout_values"
        settings:keywords="@string/keywords_screen_timeout"/>

    <SwitchPreference
        android:key="auto_rotate"
        android:title="@string/accelerometer_title" />
        android:title="@string/accelerometer_title"
        settings:keywords="@string/keywords_auto_rotate"/>

    <Preference
        android:key="color_mode"
@@ -99,7 +101,6 @@
        android:title="@string/screensaver_settings_title"
        android:fragment="com.android.settings.dream.DreamSettings" />

    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
    <com.android.settingslib.RestrictedPreference
        android:key="ambient_display"
        android:title="@string/ambient_display_screen_title"
+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@
        android:icon="@drawable/ic_wifi_tethering"
        android:order="-5"
        android:summary="@string/summary_placeholder"
        settings:keywords="@string/keywords_hotspot_tethering"
        settings:userRestriction="no_config_tethering"
        settings:useAdminDisabledSummary="true" />

Loading