From 60521ee2f9ac47eb5a4e92acdafe824051c38e49 Mon Sep 17 00:00:00 2001
From: Fan Wu <cechkahn@google.com>
Date: Thu, 10 Oct 2024 15:14:29 +0800
Subject: [PATCH] Add WifiCallingScreen and corresponding TS flag

Bug: 372732219
Test: atest
Flag: com.android.settings.flags.catalyst_wifi_calling_settings

Change-Id: I3d78b6745e1127a0a7e73ec20ae95e9c9db2c139
---
 aconfig/catalyst/network_and_internet.aconfig |  7 +++
 res/xml/wifi_calling_settings.xml             |  2 +-
 .../wifi/calling/WifiCallingScreen.kt         | 45 +++++++++++++++++++
 .../calling/WifiCallingSettingsForSub.java    |  5 +++
 .../wifi/calling/WifiCallingScreenTest.kt     | 36 +++++++++++++++
 5 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 src/com/android/settings/wifi/calling/WifiCallingScreen.kt
 create mode 100644 tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt

diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig
index 99aec82c5e9..130905f538a 100644
--- a/aconfig/catalyst/network_and_internet.aconfig
+++ b/aconfig/catalyst/network_and_internet.aconfig
@@ -28,3 +28,10 @@ flag {
   description: "Flag for Adaptive connectivity"
   bug: "323791114"
 }
+
+flag {
+  name: "catalyst_wifi_calling"
+  namespace: "android_settings"
+  description: "Flag for Wi-Fi calling screen"
+  bug: "323791114"
+}
diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
index c45f702ca13..2ce408b98dc 100644
--- a/res/xml/wifi_calling_settings.xml
+++ b/res/xml/wifi_calling_settings.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:key="wifi_calling_settings"
+                  android:key="wifi_calling"
                   android:title="@string/wifi_calling_settings_title">
 
     <com.android.settings.widget.SettingsMainSwitchPreference
diff --git a/src/com/android/settings/wifi/calling/WifiCallingScreen.kt b/src/com/android/settings/wifi/calling/WifiCallingScreen.kt
new file mode 100644
index 00000000000..b50b8284739
--- /dev/null
+++ b/src/com/android/settings/wifi/calling/WifiCallingScreen.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi.calling
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.flags.Flags
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+
+@ProvidePreferenceScreen
+class WifiCallingScreen : PreferenceScreenCreator {
+    override val key: String
+        get() = KEY
+
+    override val title: Int
+        get() = R.string.wifi_calling_settings_title
+
+    override val summary: Int
+        get() = R.string.wifi_calling_summary
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystWifiCalling()
+
+    override fun fragmentClass() = WifiCallingSettingsForSub::class.java
+
+    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}
+
+    companion object {
+        const val KEY = "wifi_calling"
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index dddbd63a6bd..1de3f5c1fe1 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -724,4 +724,9 @@ public class WifiCallingSettingsForSub extends DashboardFragment
 
         return mOverrideWfcRoamingModeWhileUsingNtn;
     }
+
+    @Override
+    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
+        return WifiCallingScreen.KEY;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt
new file mode 100644
index 00000000000..474e304b338
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingScreenTest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi.calling
+
+import com.android.settings.flags.Flags
+import com.android.settingslib.preference.CatalystScreenTestCase
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class WifiCallingScreenTest : CatalystScreenTestCase() {
+
+    override val preferenceScreenCreator = WifiCallingScreen()
+
+    override val flagName: String
+        get() = Flags.FLAG_CATALYST_WIFI_CALLING
+
+    @Test
+    fun key() {
+        assertThat(preferenceScreenCreator.key).isEqualTo(WifiCallingScreen.KEY)
+    }
+
+    override fun migration() {}
+}
\ No newline at end of file