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

Commit 7477f4ea authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Show category when search "Mobile data" 

The displayed category is "SIMs".

Bug: 346776183
Flag: EXEMPT bug fix
Test: manual - search "Mobile data"
Test: unit test
Change-Id: If3c395281e96603193e7476a9e76d1f9e9213531
parent 50a18d9e

Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -82,12 +82,10 @@ android_library { 
        "android.hardware.dumpstate-V1-java",

        "android.hardware.dumpstate-V1.0-java",

        "android.hardware.dumpstate-V1.1-java",

        "android.view.accessibility.flags-aconfig-java",

        "com_android_server_accessibility_flags_lib",

        "net-utils-framework-common",

        "notification_flags_lib",

        "securebox",

        "android.os.flags-aconfig-java",

        "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",

        "WindowManager-Shell-shared-desktopMode",
@@ -103,12 +101,9 @@ android_library { 
        "contextualcards",

        "development_settings_flag_lib",

        "factory_reset_flags_lib",

        "fuelgauge-log-protos-lite",

        "settings-protos-lite",

        "fuelgauge-protos-lite",

        "settings-contextual-card-protos-lite",

        "settings-log-bridge-protos-lite",

        "settings-logtags",

        "settings-telephony-protos-lite",

        "statslog-settings",

        "telephony_flags_core_java_lib",

        "setupdesign-lottie-loading-layout",

protos/Android.bp

+2 −34
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_android_settings_app",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_apps_Settings_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Settings_license"],

}



java_library_static {

    name: "settings-contextual-card-protos-lite",

    host_supported: true,

    proto: {

        type: "lite",

    },

    srcs: ["contextual_card_list.proto"],

}



java_library_static {

    name: "settings-log-bridge-protos-lite",

    host_supported: true,

    proto: {

        type: "lite",

    },

    srcs: ["settings_log_bridge.proto"],

}



java_library_static {

    name: "settings-telephony-protos-lite",

    host_supported: true,

    proto: {

        type: "lite",

    },

    srcs: ["network_mode_choices.proto"],

}



java_library {

    name: "fuelgauge-log-protos-lite",

    name: "settings-protos-lite",

    proto: {

        type: "lite",

    },

    srcs: ["fuelgauge_log.proto"],

    srcs: ["*.proto"],

}

protos/spa_search_landing.proto

0 → 100644
+14 −0
Original line number Diff line number Diff line 
syntax = "proto2";



package com.android.settings.spa;



message SpaSearchLandingKey {

  oneof page {

    SpaSearchLandingSpaPage spa_page = 1;

  }

}



message SpaSearchLandingSpaPage {

  /** The destination of SPA page. */

  optional string destination = 1;

}

src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt

+3 −0
Original line number Diff line number Diff line
@@ -197,6 +197,9 @@ open class NetworkCellularGroupProvider : SettingsPageProvider, SearchablePage { 
        // Do nothing

    }



    override fun getPageTitleForSearch(context: Context): String =

        context.getString(R.string.provider_network_settings_title)



    override fun getSearchableTitles(context: Context): List<String> {

        if (!isPageSearchable(context)) return emptyList()

        return buildList {

src/com/android/settings/spa/search/SearchablePage.kt

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ import android.content.Context 


interface SearchablePage {



    /** Gets the searchable titles at the current moment. */

    /** Gets the title of the page. */

    fun getPageTitleForSearch(context: Context): String = ""



    /** Gets the titles of the searchable items at the current moment. */

    fun getSearchableTitles(context: Context): List<String>

}