Merge "Prioritize dynamic summaries" into pi-dev am: c29aec4bde

am: bd4ba55cac Change-Id: I6aaa0f91e91fd0cfe19578935a539393c289d63e
2018-04-06 16:27:35 -07:00
parent 0391597948 bd4ba55cac
commit 67bf80c9ab
2 changed files with 25 additions and 13 deletions
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -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) {