Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2380c5d1 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Avoid PreferenceMetadata.getPreferenceTitle call 

Bug: 388167106
Flag: EXEMPT refactor
Test: atest
Change-Id: I6491f076c22e5cca4981d4a9270f92cd53173f74
parent 8db6c33b

src/com/android/settings/widget/FooterPreference.kt

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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)))

    }

tests/robotests/src/com/android/settings/supervision/SupervisionChangePinPreferenceTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -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)

    }

}

tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/supervision/SupervisionPinRecoveryPreferenceTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -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)

    }

}