PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix catalyst settings test failure" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-11-04 02:05:59 +00:00
committed by Android (Google) Code Review
parent 5329552b74 96aa9b27f1
commit f796239aa5
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceTest.kt
View File

@@ -22,6 +22,7 @@ import android.platform.test.flag.junit.SetFlagsRule
import android.provider.Settings import android.provider.Settings
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.preference.createAndBindWidget
import com.android.settingslib.widget.MainSwitchPreference import com.android.settingslib.widget.MainSwitchPreference
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Before import org.junit.Before
@@ -78,10 +79,6 @@ class AdaptiveConnectivityTogglePreferenceTest {
} }
private fun getMainSwitchPreferenceCompat(): MainSwitchPreference = private fun getMainSwitchPreferenceCompat(): MainSwitchPreference =
adaptiveConnectivityTogglePreference.run { adaptiveConnectivityTogglePreference.createAndBindWidget(appContext)
val preference = createWidget(appContext)
bind(preference, this)
preference as MainSwitchPreference
}
} }
// LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java) // LINT.ThenChange(AdaptiveConnectivityTogglePreferenceControllerTest.java)

8
tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceTest.kt
View File

@@ -23,7 +23,7 @@ import androidx.preference.SwitchPreferenceCompat
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.datastore.SettingsSystemStore 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 com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@@ -93,11 +93,7 @@ class DialPadTonePreferenceTest {
} }
private fun getSwitchPreference(): SwitchPreferenceCompat = private fun getSwitchPreference(): SwitchPreferenceCompat =
DefaultPreferenceBindingFactory.getPreferenceBinding(dialPadTonePreference).run { dialPadTonePreference.createAndBindWidget(context)
val preference = createWidget(context)
bind(preference, dialPadTonePreference)
preference as SwitchPreferenceCompat
}
private fun enableDialPadTone(enabled: Boolean) = private fun enableDialPadTone(enabled: Boolean) =
SettingsSystemStore.get(context).setBoolean(DTMF_TONE_WHEN_DIALING, enabled) SettingsSystemStore.get(context).setBoolean(DTMF_TONE_WHEN_DIALING, enabled)