From af1e8f7353f67ef9ab2c776cdeff673e7138f089 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 17 Oct 2024 14:03:05 +0800 Subject: [PATCH] [Catalyst] SIMs screen migration - Add a flag for the migration - Add the skeleton of the screen Test: atest MobileNetworkListScreenTest Bug: 368355368 Flag: com.android.settings.flags.catalyst_mobile_network_list Change-Id: I9d5d57b78d8f2c7d2bc6fd02e402fcdaf5b97bdf --- aconfig/catalyst/network_and_internet.aconfig | 7 +++ .../network/MobileNetworkListFragment.kt | 2 + .../network/MobileNetworkListScreen.kt | 50 +++++++++++++++++++ .../network/MobileNetworkListScreenTest.kt | 36 +++++++++++++ 4 files changed, 95 insertions(+) create mode 100644 src/com/android/settings/network/MobileNetworkListScreen.kt create mode 100644 tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig index a3e1784035d..a5183f3738a 100644 --- a/aconfig/catalyst/network_and_internet.aconfig +++ b/aconfig/catalyst/network_and_internet.aconfig @@ -7,3 +7,10 @@ flag { description: "Flag for Network & Internet" bug: "323791114" } + +flag { + name: "catalyst_mobile_network_list" + namespace: "android_settings" + description: "Flag for SIMs" + bug: "323791114" +} diff --git a/src/com/android/settings/network/MobileNetworkListFragment.kt b/src/com/android/settings/network/MobileNetworkListFragment.kt index 3118088c6c3..a0da636379b 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.kt +++ b/src/com/android/settings/network/MobileNetworkListFragment.kt @@ -92,4 +92,6 @@ class MobileNetworkListFragment : DashboardFragment() { simRepositoryFactory(context).canEnterMobileNetworkPage() } } + + override fun getPreferenceScreenBindingKey(context: Context) = MobileNetworkListScreen.KEY } diff --git a/src/com/android/settings/network/MobileNetworkListScreen.kt b/src/com/android/settings/network/MobileNetworkListScreen.kt new file mode 100644 index 00000000000..93d8ee671d1 --- /dev/null +++ b/src/com/android/settings/network/MobileNetworkListScreen.kt @@ -0,0 +1,50 @@ +/* + * 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.ProvidePreferenceScreen +import com.android.settingslib.metadata.preferenceHierarchy +import com.android.settingslib.preference.PreferenceScreenCreator + +@ProvidePreferenceScreen +class MobileNetworkListScreen : PreferenceScreenCreator { + override val key: String + get() = KEY + + override val title: Int + get() = R.string.provider_network_settings_title + + override val icon: Int + get() = R.drawable.ic_sim_card + + override val keywords: Int + get() = R.string.keywords_more_mobile_networks + + override fun isFlagEnabled(context: Context) = Flags.catalystMobileNetworkList() + + override fun hasCompleteHierarchy() = false + + override fun fragmentClass() = MobileNetworkListFragment::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + companion object { + const val KEY = "mobile_network_list" + } +} diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.kt new file mode 100644 index 00000000000..1d7a1d989e4 --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListScreenTest.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.network + +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 + +@RunWith(AndroidJUnit4::class) +class MobileNetworkListScreenTest : CatalystScreenTestCase() { + override val preferenceScreenCreator = MobileNetworkListScreen() + + override val flagName: String + get() = Flags.FLAG_CATALYST_MOBILE_NETWORK_LIST + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(MobileNetworkListScreen.KEY) + } +}