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

Commit 4582dab0 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Allow use of comma to separate search keywords, update keywords"

parents c5cde055 35c34548

res/values/strings.xml

+32 −34
Original line number Diff line number Diff line
@@ -5512,46 +5512,44 @@ 
    <string name="search_results_label">Results</string>



    <!--Search Keywords [CHAR LIMIT=NONE]-->

    <string name="keywords_wifi">wifi wi-fi network connection</string>

    <string name="keywords_more_default_sms_app">text message texting messages messaging</string>

    <string name="keywords_more_mobile_networks">cellular cell carrier wireless data 4g 3g 2g lte</string>

    <string name="keywords_wifi_calling">wifi wi-fi call calling</string>

    <string name="keywords_wifi">wifi, wi-fi, network connection</string>

    <string name="keywords_more_default_sms_app">text message, texting, messages, messaging</string>

    <string name="keywords_more_mobile_networks">cellular, 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_display">screen touchscreen</string>

    <string name="keywords_display_brightness_level">dim screen touchscreen battery</string>

    <string name="keywords_display_auto_brightness">dim screen touchscreen battery</string>

    <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->

    <string name="keywords_display_night_mode">dark theme night mode dim screen invert brightness</string>

    <string name="keywords_display_wallpaper">background personalize customize display</string>

    <string name="keywords_display">screen, touchscreen</string>

    <string name="keywords_display_brightness_level">dim screen, touchscreen, battery</string>

    <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery</string>

    <string name="keywords_display_night_mode">dark theme, night mode, dim screen, invert brightness</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>

    <string name="keywords_storage">space disk hard drive device usage</string>

    <string name="keywords_battery">power usage charge</string>

    <string name="keywords_spell_checker">spelling dictionary spellcheck auto-correct</string>

    <string name="keywords_voice_input">recognizer input speech speak language hands-free hand free recognition offensive word audio history bluetooth headset</string>

    <string name="keywords_text_to_speech_output">rate language default speak speaking tts accessibility 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_display_cast_screen">project, cast</string>

    <string name="keywords_storage">space, disk, hard drive, device usage</string>

    <string name="keywords_battery">power usage, charge</string>

    <string name="keywords_spell_checker">spelling, dictionary, spellcheck, auto-correct</string>

    <string name="keywords_voice_input">recognizer, input, speech, speak, language, hands-free, hand free recognition offensive word audio history bluetooth headset</string>

    <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_printing">printer</string>

    <string name="keywords_sounds">speaker beep</string>

    <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb interrupt interruption break</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>

    <string name="keywords_location">nearby, location, history, reporting</string>

    <string name="keywords_location_mode">accuracy</string>

    <string name="keywords_accounts">account</string>

    <string name="keywords_users">restriction restrict restricted</string>

    <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>

    <string name="keywords_reset_apps">reset preferences default</string>

    <string name="keywords_emergency_app">emergency ice app default</string>

    <string name="keywords_default_phone_app">phone dialer default</string>

    <string name="keywords_all_apps">apps download applications system</string>

    <string name="keywords_app_permissions">apps permissions security</string>

    <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>

    <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->

    <string name="keywords_lockscreen">slide password pattern pin</string>

    <string name="keywords_users">restriction, restrict, restricted</string>

    <string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international</string>

    <string name="keywords_reset_apps">reset, preferences, default</string>

    <string name="keywords_emergency_app">emergency, ice, app, default</string>

    <string name="keywords_default_phone_app">phone, dialer, default</string>

    <string name="keywords_all_apps">apps, download, applications, system</string>

    <string name="keywords_app_permissions">apps, permissions, security</string>

    <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_lockscreen">slide to unlock, password, pattern, pin</string>



    <!-- NFC Wi-Fi pairing/setup strings-->
@@ -6616,7 +6614,7 @@ 
    <!-- Title of setting that controls screen zoom (e.g. how large interface elements appear). [CHAR LIMIT=40] -->

    <string name="screen_zoom_title">Screen zoom</string>

    <!-- Keywords for setting that controls screen zoom (e.g. how large interface elements appear). [CHAR LIMIT=NONE] -->

    <string name="screen_zoom_keywords">display density screen zoom scale scaling</string>

    <string name="screen_zoom_keywords">display density, screen zoom, scale, scaling</string>



    <string name="screen_zoom_summary">Choose how zoomed you want the screen using the slider below the preview image.</string>

src/com/android/settings/search/Index.java

+16 −10
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ public class Index { 


    private static final String EMPTY = "";

    private static final String NON_BREAKING_HYPHEN = "\u2011";

    private static final String LIST_DELIMITERS = "[,]\\s*";

    private static final String HYPHEN = "-";

    private static final String SPACE = " ";



    private static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =

            "SEARCH_INDEX_DATA_PROVIDER";
@@ -1002,12 +1004,13 @@ public class Index { 
        final String normalizedSummaryOn = normalizeString(updatedSummaryOn);

        final String normalizedSummaryOff = normalizeString(updatedSummaryOff);



        final String spaceDelimitedKeywords = normalizeKeywords(keywords);



        updateOneRow(database, locale,

                updatedTitle, normalizedTitle, updatedSummaryOn, normalizedSummaryOn,

                updatedSummaryOff, normalizedSummaryOff, entries,

                className, screenTitle, iconResId,

                rank, keywords, intentAction, intentTargetPackage, intentTargetClass, enabled,

                key, userId);

                updatedSummaryOff, normalizedSummaryOff, entries, className, screenTitle, iconResId,

                rank, spaceDelimitedKeywords, intentAction, intentTargetPackage, intentTargetClass,

                enabled, key, userId);

    }



    private static String normalizeHyphen(String input) {
@@ -1021,11 +1024,14 @@ public class Index { 
        return REMOVE_DIACRITICALS_PATTERN.matcher(normalized).replaceAll("").toLowerCase();

    }



    private void updateOneRow(SQLiteDatabase database, String locale,

            String updatedTitle, String normalizedTitle,

            String updatedSummaryOn, String normalizedSummaryOn,

            String updatedSummaryOff, String normalizedSummaryOff, String entries,

            String className, String screenTitle, int iconResId, int rank, String keywords,

    private static String normalizeKeywords(String input) {

        return (input != null) ? input.replaceAll(LIST_DELIMITERS, SPACE) : EMPTY;

    }



    private void updateOneRow(SQLiteDatabase database, String locale, String updatedTitle,

            String normalizedTitle, String updatedSummaryOn, String normalizedSummaryOn,

            String updatedSummaryOff, String normalizedSummaryOff, String entries, String className,

            String screenTitle, int iconResId, int rank, String spaceDelimitedKeywords,

            String intentAction, String intentTargetPackage, String intentTargetClass,

            boolean enabled, String key, int userId) {
@@ -1050,7 +1056,7 @@ public class Index { 
        values.put(IndexColumns.DATA_SUMMARY_OFF, updatedSummaryOff);

        values.put(IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, normalizedSummaryOff);

        values.put(IndexColumns.DATA_ENTRIES, entries);

        values.put(IndexColumns.DATA_KEYWORDS, keywords);

        values.put(IndexColumns.DATA_KEYWORDS, spaceDelimitedKeywords);

        values.put(IndexColumns.CLASS_NAME, className);

        values.put(IndexColumns.SCREEN_TITLE, screenTitle);

        values.put(IndexColumns.INTENT_ACTION, intentAction);