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

Commit 55459042 authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Add wifi calling slice to settings search and AGSA"

parents 8a789723 85e1218b

res/xml/mobile_network_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
        settings:searchable="false">



        <PreferenceScreen

            android:key="wifi_calling_key"

            android:key="wifi_calling"

            android:title="@string/wifi_calling_settings_title"

            android:summary="@string/wifi_calling_summary"

            settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >

res/xml/mobile_network_settings_v2.xml

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
            android:title="@string/call_category">



            <PreferenceScreen

                android:key="wifi_calling_key"

                android:key="wifi_calling"

                android:title="@string/wifi_calling_settings_title"

                android:summary="@string/wifi_calling_summary"

                settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">

src/com/android/settings/slices/SettingsSliceProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ public class SettingsSliceProvider extends SliceProvider { 
                    CustomSliceRegistry.FLASHLIGHT_SLICE_URI,

                    CustomSliceRegistry.LOCATION_SLICE_URI,

                    CustomSliceRegistry.MOBILE_DATA_SLICE_URI,

                    CustomSliceRegistry.WIFI_CALLING_URI,

                    CustomSliceRegistry.WIFI_SLICE_URI,

                    CustomSliceRegistry.ZEN_MODE_SLICE_URI

            );

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ public class SettingsSliceProviderTest { 
    private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList(

            CustomSliceRegistry.ZEN_MODE_SLICE_URI,

            CustomSliceRegistry.FLASHLIGHT_SLICE_URI,

            CustomSliceRegistry.MOBILE_DATA_SLICE_URI

            CustomSliceRegistry.MOBILE_DATA_SLICE_URI,

            CustomSliceRegistry.WIFI_CALLING_URI

    );



    @Before