Merge "Update Prevent Ringing summary when it turn off" into sc-dev

2021-05-06 05:07:25 +00:00
parent 0dc1ee01f8 aa48592b40
commit 3aca460dfc
2 changed files with 4 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
@@ -97,7 +97,8 @@ public class PreventRingingParentPreferenceControllerTest {
        Settings.Secure.putInt(mContext.getContentResolver(), VOLUME_HUSH_GESTURE,
                VOLUME_HUSH_OFF);
        mController.updateState(mPreference);
-        assertThat(mPreference.getSummary()).isEqualTo(null);
+        assertThat(mPreference.getSummary()).isEqualTo(mContext.getResources().getText(
+                R.string.switch_off_text));
    }

    @Test