Fix catalyst settings test failure
NO_IFTTT=Catalyst only
Bug: 332201912
Flag: EXEMPT test
Test: atest
Change-Id: I064a63dfe075374fbbe7bee293d8efe70a91e473
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
index 913adf6..d85980e 100644
--- a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
@@ -22,6 +22,7 @@
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 @@
}
private fun getMainSwitchPreferenceCompat(): MainSwitchPreference =
- adaptiveConnectivityTogglePreference.run {
- val preference = createWidget(appContext)
- bind(preference, this)
- preference as MainSwitchPreference
- }
+ adaptiveConnectivityTogglePreference.createAndBindWidget(appContext)
}
// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java)
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
index 63e8e3d..ef14166 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
@@ -23,7 +23,7 @@
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 @@
}
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)