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

Merge "Prioritize dynamic summaries" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-06 22:29:02 +00:00
committed by Android (Google) Code Review
parent 4ef7b5f97b 8db4358f76
commit c29aec4bde
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -253,11 +253,7 @@ public class SliceBuilderUtils {
@VisibleForTesting
static CharSequence getSubtitleText(Context context, AbstractPreferenceController controller,
SliceData sliceData) {
CharSequence summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
CharSequence summaryText;
if (controller != null) {
summaryText = controller.getSummary();
@@ -266,7 +262,12 @@ public class SliceBuilderUtils {
}
}
return sliceData.getScreenTitle();
summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
return "";
}
private static boolean isValidSummary(Context context, CharSequence summary) {

25
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -188,26 +188,25 @@ public class SliceBuilderUtilsTest {
}
@Test
public void testDynamicSummary_returnsSliceScreenTitle() {
public void testDynamicSummary_returnsSliceEmptyString() {
final SliceData data = getDummyData((String) null);
final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getScreenTitle());
assertThat(summary).isEqualTo("");
}
@Test
public void testDynamicSummary_placeHolderString_returnsScreenTitle() {
public void testDynamicSummary_placeHolderString_returnsEmptyString() {
final SliceData data = getDummyData(mContext.getString(R.string.summary_placeholder));
final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getScreenTitle());
assertThat(summary).isEqualTo("");
}
@Test
public void testDynamicSummary_sliceDataAndFragmentPlaceholder_returnsSliceScreenTitle() {
public void testDynamicSummary_sliceDataAndFragmentPlaceholder_returnsSliceEmptyString() {
final String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
final SliceData data = getDummyData(summaryPlaceholder);
final FakePreferenceController controller = spy(
@@ -216,7 +215,19 @@ public class SliceBuilderUtilsTest {
CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getScreenTitle());
assertThat(summary).isEqualTo("");
}
@Test
public void summaryText_bothDynamicAndStaticSummary_dynamicSummaryReturned() {
SliceData data = getDummyData("bad_summary");
FakePreferenceController controller = spy(new FakePreferenceController(mContext, KEY));
String controllerSummary = "new_Summary";
doReturn(controllerSummary).when(controller).getSummary();
CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(controllerSummary);
}
@Test