Add nested toggle switches under Adaptive connectivity settings UI

Bug: 393645580
Flag: com.android.settings.flags.enable_nested_toggle_switches
Test: Manual testing
atest AdaptiveConnectivityScreenTest
hsv: https://hsv.googleplex.com/5165236934934528

Change-Id: I12403f5c80290ebccc04f11771ec3f06ee216610
This commit is contained in:
noshinmir
2025-02-14 02:31:23 +00:00
parent fe36b334cf
commit 16e32fae3f
5 changed files with 98 additions and 26 deletions

View File

@@ -16,13 +16,17 @@
package com.android.settings.network
import androidx.preference.SwitchPreferenceCompat
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.flags.Flags
import com.android.settings.network.AdaptiveConnectivitySettings.ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED
import com.android.settings.network.AdaptiveConnectivitySettings.ADAPTIVE_CONNECTIVITY_WIFI_ENABLED
import com.android.settingslib.preference.CatalystScreenTestCase
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
@Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class)
class AdaptiveConnectivityScreenTest : CatalystScreenTestCase() {
override val preferenceScreenCreator = AdaptiveConnectivityScreen()
@@ -35,4 +39,23 @@ class AdaptiveConnectivityScreenTest : CatalystScreenTestCase() {
fun key() {
assertThat(preferenceScreenCreator.key).isEqualTo(AdaptiveConnectivityScreen.KEY)
}
@Test
fun flagDefaultDisabled_noSwitchPreferenceCompatExists() {
// create fragment
val fragment: AdaptiveConnectivitySettings =
preferenceScreenCreator.fragmentClass().newInstance()
// check if switch preference exists
assertSwitchPreferenceCompatIsNull(ADAPTIVE_CONNECTIVITY_WIFI_ENABLED, fragment)
assertSwitchPreferenceCompatIsNull(ADAPTIVE_CONNECTIVITY_MOBILE_NETWORK_ENABLED, fragment)
}
private fun assertSwitchPreferenceCompatIsNull(
key: String,
fragment: AdaptiveConnectivitySettings
) {
val switchPreference = fragment.findPreference<SwitchPreferenceCompat>(key)
assertThat(switchPreference).isNull()
}
}