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

[Catalyst] Avoid PreferenceMetadata.getPreferenceTitle call

Browse Source 
Bug: 388167106
Flag: EXEMPT refactor
Test: atest
Change-Id: I6491f076c22e5cca4981d4a9270f92cd53173f74
This commit is contained in:
Jacky Wang
2025-03-10 10:40:59 +08:00
parent 8db6c33b46
commit 2380c5d1e4
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/widget/FooterPreference.kt
View File

@@ -19,6 +19,7 @@ package com.android.settings.widget
import android.content.Context import android.content.Context
import androidx.preference.Preference import androidx.preference.Preference
import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceMetadata
import com.android.settingslib.metadata.getPreferenceTitle
import com.android.settingslib.preference.PreferenceBinding import com.android.settingslib.preference.PreferenceBinding
import com.android.settingslib.widget.FooterPreference import com.android.settingslib.widget.FooterPreference
import com.android.settingslib.widget.preference.footer.R import com.android.settingslib.widget.preference.footer.R

4
tests/robotests/src/com/android/settings/network/tether/TetherScreenTest.kt
View File

@@ -57,7 +57,7 @@ class TetherScreenTest : CatalystScreenTestCase() {
fun getPreferenceTitle_tetherConfigDisallowed_shouldShowAll() { fun getPreferenceTitle_tetherConfigDisallowed_shouldShowAll() {
ShadowRestrictedLockUtilsInternal.setRestricted(true) ShadowRestrictedLockUtilsInternal.setRestricted(true)
assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo( assertThat(preferenceScreenCreator.getTitle(appContext)).isEqualTo(
appContext.getString(R.string.tether_settings_title_all)) appContext.getString(R.string.tether_settings_title_all))
} }
@@ -66,7 +66,7 @@ class TetherScreenTest : CatalystScreenTestCase() {
ShadowRestrictedLockUtilsInternal.setRestricted(false) ShadowRestrictedLockUtilsInternal.setRestricted(false)
val tm = appContext.getSystemService(TetheringManager::class.java) val tm = appContext.getSystemService(TetheringManager::class.java)
assertThat(preferenceScreenCreator.getPreferenceTitle(appContext)).isEqualTo( assertThat(preferenceScreenCreator.getTitle(appContext)).isEqualTo(
appContext.getText(Utils.getTetheringLabel(tm))) appContext.getText(Utils.getTetheringLabel(tm)))
} }

5
tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt
View File

@@ -18,6 +18,7 @@ package com.android.settings.supervision
import android.content.Context import android.content.Context
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.settings.R
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
@@ -30,7 +31,7 @@ class SupervisionChangePinPreferenceTest {
@Test @Test
fun getTitle() { fun getTitle() {
assertThat(supervisionChangePinPreference.getPreferenceTitle(context)) assertThat(supervisionChangePinPreference.title)
.isEqualTo("Change PIN") .isEqualTo(R.string.supervision_change_pin_preference_title)
} }
} }

4
tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt
View File

@@ -36,8 +36,8 @@ class SupervisionPinManagementScreenTest {
@Test @Test
fun getTitle() { fun getTitle() {
assertThat(supervisionPinManagementScreen.getPreferenceTitle(context)) assertThat(supervisionPinManagementScreen.title)
.isEqualTo("Manage PIN") .isEqualTo(R.string.supervision_pin_management_preference_title)
} }
@Test @Test

5
tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt
View File

@@ -18,6 +18,7 @@ package com.android.settings.supervision
import android.content.Context import android.content.Context
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.settings.R
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
@@ -30,7 +31,7 @@ class SupervisionPinRecoveryPreferenceTest {
@Test @Test
fun getTitle() { fun getTitle() {
assertThat(supervisionPinRecoveryPreference.getPreferenceTitle(context)) assertThat(supervisionPinRecoveryPreference.title)
.isEqualTo("Forgot PIN") .isEqualTo(R.string.supervision_add_forgot_pin_preference_title)
} }
} }

5
tests/robotests/src/com/android/settings/supervision/SupervisionWebContentFiltersScreenTest.kt
View File

@@ -18,6 +18,7 @@ package com.android.settings.supervision
import android.content.Context import android.content.Context
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.settings.R
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
@@ -35,7 +36,7 @@ class SupervisionWebContentFiltersScreenTest {
@Test @Test
fun getTitle() { fun getTitle() {
assertThat(supervisionWebContentFiltersScreen.getPreferenceTitle(context)) assertThat(supervisionWebContentFiltersScreen.title)
.isEqualTo("Web content filters") .isEqualTo(R.string.supervision_web_content_filters_title)
} }
} }