diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig index a5183f3738a..94faaefd223 100644 --- a/aconfig/catalyst/network_and_internet.aconfig +++ b/aconfig/catalyst/network_and_internet.aconfig @@ -8,6 +8,13 @@ flag { bug: "323791114" } +flag { + name: "catalyst_internet_settings" + namespace: "android_settings" + description: "Flag for Internet" + bug: "323791114" +} + flag { name: "catalyst_mobile_network_list" namespace: "android_settings" diff --git a/src/com/android/settings/network/NetworkProviderScreen.kt b/src/com/android/settings/network/NetworkProviderScreen.kt new file mode 100644 index 00000000000..fa3ed788b2a --- /dev/null +++ b/src/com/android/settings/network/NetworkProviderScreen.kt @@ -0,0 +1,54 @@ +/* + * 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.network + +import android.content.Context +import com.android.settings.R +import com.android.settings.flags.Flags +import com.android.settingslib.metadata.PreferenceAvailabilityProvider +import com.android.settingslib.metadata.ProvidePreferenceScreen +import com.android.settingslib.metadata.preferenceHierarchy +import com.android.settingslib.preference.PreferenceScreenCreator + +@ProvidePreferenceScreen +class NetworkProviderScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider { + override val key: String + get() = KEY + + override val title: Int + get() = R.string.provider_internet_settings + + override val icon: Int + get() = R.drawable.ic_settings_wireless + + override val keywords: Int + get() = R.string.keywords_internet + + override fun isAvailable(context: Context) = + context.resources.getBoolean(R.bool.config_show_internet_settings) + + override fun isFlagEnabled(context: Context) = Flags.catalystInternetSettings() + + override fun hasCompleteHierarchy() = false + + override fun fragmentClass() = NetworkProviderSettings::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + companion object { + const val KEY = "internet_settings" + } +} diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index b268461a0ec..455201ac4c5 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -1508,4 +1508,9 @@ public class NetworkProviderSettings extends RestrictedDashboardFragment return android.R.attr.colorControlNormal; } } + + @Override + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { + return NetworkProviderScreen.KEY; + } } diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt b/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt new file mode 100644 index 00000000000..d8888c5cc3c --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/NetworkProviderScreenTest.kt @@ -0,0 +1,65 @@ +/* + * 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.network + +import android.content.ContextWrapper +import android.content.res.Resources +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.flags.Flags +import com.android.settingslib.preference.CatalystScreenTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.stub + +@RunWith(AndroidJUnit4::class) +class NetworkProviderScreenTest : CatalystScreenTestCase() { + override val preferenceScreenCreator = NetworkProviderScreen() + + override val flagName: String + get() = Flags.FLAG_CATALYST_INTERNET_SETTINGS + + private val mockResources = mock() + + private val context = + object : ContextWrapper(appContext) { + override fun getResources(): Resources = mockResources + } + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(NetworkProviderScreen.KEY) + } + + @Test + fun isAvailable_showInternetSettings_shouldReturnTrue() { + mockResources.stub { on { getBoolean(anyInt()) } doReturn true } + + assertThat(preferenceScreenCreator.isAvailable(context)).isTrue() + } + + @Test + fun isAvailable_notShowInternetSettings_shouldReturnFalse() { + mockResources.stub { on { getBoolean(anyInt()) } doReturn false } + + assertThat(preferenceScreenCreator.isAvailable(context)).isFalse() + } + + override fun migration() {} +}