Merge "Add WifiCallingScreen and corresponding TS flag" into main (010fbe03) · Commits · e / os / android_packages_apps_Settings

aconfig/catalyst/network_and_internet.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -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"
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* 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

+5 −0

Original line number	Diff line number	Diff line
		@@ -724,4 +724,9 @@ public class WifiCallingSettingsForSub extends DashboardFragment

		return mOverrideWfcRoamingModeWhileUsingNtn;
		}

		@Override
		public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {
		return WifiCallingScreen.KEY;
		}
		}

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* 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