diff --git a/src/com/android/settings/widget/FooterPreference.kt b/src/com/android/settings/widget/FooterPreference.kt index f4f5b108345..afc96c196a5 100644 --- a/src/com/android/settings/widget/FooterPreference.kt +++ b/src/com/android/settings/widget/FooterPreference.kt @@ -19,6 +19,7 @@ package com.android.settings.widget import android.content.Context import androidx.preference.Preference import com.android.settingslib.metadata.PreferenceMetadata +import com.android.settingslib.metadata.getPreferenceTitle import com.android.settingslib.preference.PreferenceBinding import com.android.settingslib.widget.FooterPreference import com.android.settingslib.widget.preference.footer.R diff --git a/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt b/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt index f3d1d394e30..e0e061d2c7e 100644 --- a/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt +++ b/tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt @@ -57,7 +57,7 @@ class TetherScreenTest : CatalystScreenTestCase() { fun getPreferenceTitle_tetherConfigDisallowed_shouldShowAll() { ShadowRestrictedLockUtilsInternal.setRestricted(true) - assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo( + assertThat(preferenceScreenCreator.getTitle(appContext)).isEqualTo( appContext.getString(R.string.tether_settings_title_all)) } @@ -66,7 +66,7 @@ class TetherScreenTest : CatalystScreenTestCase() { ShadowRestrictedLockUtilsInternal.setRestricted(false) val tm = appContext.getSystemService(TetheringManager::class.java) - assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo( + assertThat(preferenceScreenCreator.getTitle(appContext)).isEqualTo( appContext.getText(Utils.getTetheringLabel(tm))) } diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt index 4ad9c266123..91d0044e17d 100644 --- a/tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt +++ b/tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt @@ -18,6 +18,7 @@ package com.android.settings.supervision import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.R import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith @@ -30,7 +31,7 @@ class SupervisionChangePinPreferenceTest { @Test fun getTitle() { - assertThat(supervisionChangePinPreference.getPreferenceTitle(context)) - .isEqualTo("Change PIN") + assertThat(supervisionChangePinPreference.title) + .isEqualTo(R.string.supervision_change_pin_preference_title) } } diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt index b39bc5a51e6..90719fba908 100644 --- a/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt +++ b/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt @@ -36,8 +36,8 @@ class SupervisionPinManagementScreenTest { @Test fun getTitle() { - assertThat(supervisionPinManagementScreen.getPreferenceTitle(context)) - .isEqualTo("Manage PIN") + assertThat(supervisionPinManagementScreen.title) + .isEqualTo(R.string.supervision_pin_management_preference_title) } @Test diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt index 3fa938f6e57..22ee241182b 100644 --- a/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt +++ b/tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt @@ -18,6 +18,7 @@ package com.android.settings.supervision import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.R import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith @@ -30,7 +31,7 @@ class SupervisionPinRecoveryPreferenceTest { @Test fun getTitle() { - assertThat(supervisionPinRecoveryPreference.getPreferenceTitle(context)) - .isEqualTo("Forgot PIN") + assertThat(supervisionPinRecoveryPreference.title) + .isEqualTo(R.string.supervision_add_forgot_pin_preference_title) } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt index b8e208c50b0..351cbdeaa19 100644 --- a/tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt +++ b/tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt @@ -18,6 +18,7 @@ package com.android.settings.supervision import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.R import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith @@ -35,7 +36,7 @@ class SupervisionWebContentFiltersScreenTest { @Test fun getTitle() { - assertThat(supervisionWebContentFiltersScreen.getPreferenceTitle(context)) - .isEqualTo("Web content filters") + assertThat(supervisionWebContentFiltersScreen.title) + .isEqualTo(R.string.supervision_web_content_filters_title) } }