PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wifi calling slice to settings search and AGSA

Browse Source 
Fixes: 121041498
Test: test if wifi calling slice is appeared in Settings Search
Change-Id: I4892da6e7d396f28bb232f8e520a8c946f35570d
This commit is contained in:
Raff Tsai
2019-07-12 13:26:09 +08:00
parent 0eeb83c0f8
commit 85e1218b31
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/mobile_network_settings.xml
View File

@@ -81,7 +81,7 @@
settings:searchable="false"> settings:searchable="false">
<PreferenceScreen <PreferenceScreen
android:key="wifi_calling_key" android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title" android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary" android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" > settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >

2
res/xml/mobile_network_settings_v2.xml
View File

@@ -127,7 +127,7 @@
android:title="@string/call_category"> android:title="@string/call_category">
<PreferenceScreen <PreferenceScreen
android:key="wifi_calling_key" android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title" android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary" android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController"> settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">

1
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -123,6 +123,7 @@ public class SettingsSliceProvider extends SliceProvider {
CustomSliceRegistry.FLASHLIGHT_SLICE_URI, CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
CustomSliceRegistry.LOCATION_SLICE_URI, CustomSliceRegistry.LOCATION_SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI, CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_CALLING_URI,
CustomSliceRegistry.WIFI_SLICE_URI, CustomSliceRegistry.WIFI_SLICE_URI,
CustomSliceRegistry.ZEN_MODE_SLICE_URI CustomSliceRegistry.ZEN_MODE_SLICE_URI
); );

3
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -122,7 +122,8 @@ public class SettingsSliceProviderTest {
private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList( private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList(
CustomSliceRegistry.ZEN_MODE_SLICE_URI, CustomSliceRegistry.ZEN_MODE_SLICE_URI,
CustomSliceRegistry.FLASHLIGHT_SLICE_URI, CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_CALLING_URI
); );
@Before @Before