From 85e1218b318422e4a9f804355b77fd54d0915201 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Fri, 12 Jul 2019 13:26:09 +0800
Subject: [PATCH] Add wifi calling slice to settings search and AGSA

Fixes: 121041498
Test: test if wifi calling slice is appeared in Settings Search
Change-Id: I4892da6e7d396f28bb232f8e520a8c946f35570d
---
 res/xml/mobile_network_settings.xml                            | 2 +-
 res/xml/mobile_network_settings_v2.xml                         | 2 +-
 src/com/android/settings/slices/SettingsSliceProvider.java     | 1 +
 .../com/android/settings/slices/SettingsSliceProviderTest.java | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 1a9b88508f0..488761f4791 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -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" >
diff --git a/res/xml/mobile_network_settings_v2.xml b/res/xml/mobile_network_settings_v2.xml
index 506b354ba42..e77bf2d53fe 100644
--- a/res/xml/mobile_network_settings_v2.xml
+++ b/res/xml/mobile_network_settings_v2.xml
@@ -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">
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 735fc8aa07b..8a6496f162b 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -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
             );
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 968ba2d7966..ab4ece2f7d3 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -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