Merge "Fix catalyst settings test failure" into main (f796239a) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.platform.test.flag.junit.SetFlagsRule
		import android.provider.Settings
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settingslib.preference.createAndBindWidget
		import com.android.settingslib.widget.MainSwitchPreference
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		@@ -78,10 +79,6 @@ class AdaptiveConnectivityTogglePreferenceTest {
		}

		private fun getMainSwitchPreferenceCompat(): MainSwitchPreference =
		adaptiveConnectivityTogglePreference.run {
		val preference = createWidget(appContext)
		bind(preference, this)
		preference as MainSwitchPreference
		}
		adaptiveConnectivityTogglePreference.createAndBindWidget(appContext)
		}
		// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java)

+2 −6

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import androidx.preference.SwitchPreferenceCompat
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.android.settingslib.datastore.SettingsSystemStore
		import com.android.settingslib.preference.DefaultPreferenceBindingFactory
		import com.android.settingslib.preference.createAndBindWidget
		import com.google.common.truth.Truth.assertThat
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -93,11 +93,7 @@ class DialPadTonePreferenceTest {
		}

		private fun getSwitchPreference(): SwitchPreferenceCompat =
		DefaultPreferenceBindingFactory.getPreferenceBinding(dialPadTonePreference).run {
		val preference = createWidget(context)
		bind(preference, dialPadTonePreference)
		preference as SwitchPreferenceCompat
		}
		dialPadTonePreference.createAndBindWidget(context)

		private fun enableDialPadTone(enabled: Boolean) =
		SettingsSystemStore.get(context).setBoolean(DTMF_TONE_WHEN_DIALING, enabled)