Merge "Home Controls: Add conditional copy for setting." into tm-dev

2022-03-30 15:05:05 +00:00
parent a5f29f2e93 c138118d48
commit 126e629c7d
3 changed files with 6 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java
@@ -109,7 +109,7 @@ public class ControlsTrivialPrivacyPreferenceControllerTest {
        Settings.Secure.putInt(mContentResolver, DEPENDENCY_SETTING_KEY, 0);

        assertThat(mController.getSummary().toString()).isEqualTo(
-                mContext.getText(R.string.lockscreen_trivial_controls_summary));
+                mContext.getText(R.string.lockscreen_trivial_disabled_controls_summary));
    }

    @Test