Update texts for Settings->Sound->Do not disturb

- Update title to "Do not disturb preferences"
- Add summary text to reflect the priority only allows preferences
- Refactor the summary handling in ZenModeSettings so that the
  controller can get the summary text

Fix: 34975939
Test: make RunSettingsRoboTests

Change-Id: I3ca1dc43fe1d943735a9f625e66c89708a18300a
This commit is contained in:
Doris Ling
2017-02-15 12:04:57 -08:00
parent ec6cd665b1
commit 4d8a9bd879
5 changed files with 125 additions and 55 deletions

View File

@@ -36,21 +36,20 @@ import static org.mockito.Mockito.spy;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeSettingsTest {
private ZenModeSettings mSettings;
private ZenModeSettings.SummaryBuilder mBuilder;
private Context mContext;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application.getApplicationContext();
mSettings = spy(ZenModeSettings.class);
doReturn(mContext).when(mSettings).getContext();
mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
}
@Test
public void testAppend_conditionFalse_shouldNotAppend() {
String original = "test";
final String result = mSettings.append(original, false, R.string.zen_mode_alarms);
final String result = mBuilder.append(original, false, R.string.zen_mode_alarms);
assertThat(result).isEqualTo(original);
}
@@ -60,7 +59,7 @@ public class ZenModeSettingsTest {
String original = "test";
String alarm = mContext.getString(R.string.zen_mode_alarms);
final String result = mSettings.append(original, true, R.string.zen_mode_alarms);
final String result = mBuilder.append(original, true, R.string.zen_mode_alarms);
assertThat(result).contains(alarm);
}