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

Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220

Change-Id: I2db1d3c880208cee5852c987c8edfdd6a5908a36
This commit is contained in:
TreeHugger Robot
2021-05-06 05:26:58 +00:00
committed by Automerger Merge Worker
parent ab3528dc86 3aca460dfc
commit cb07496c14
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
View File

@@ -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);
}

3
tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
View File

@@ -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