From aa48592b40ee75761cd3b679eca983134505abc1 Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Thu, 6 May 2021 01:44:50 +0800 Subject: [PATCH] Update Prevent Ringing summary when it turn off Bug: 187145174 Test: manual & robotest Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810 --- .../gestures/PreventRingingParentPreferenceController.java | 3 ++- .../gestures/PreventRingingParentPreferenceControllerTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java index ca1f1c775b4..b67943817ee 100644 --- a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java @@ -92,8 +92,9 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo case VOLUME_HUSH_MUTE: summary = mContext.getText(R.string.prevent_ringing_option_mute_summary); break; + // VOLUME_HUSH_OFF default: - summary = null; + summary = mContext.getText(R.string.switch_off_text); } preference.setSummary(summary); } diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index 9e4877c954f..4844a1cb0a7 100644 --- 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