Merge "Set slice summary text to screentitle first" into pi-dev am: e7f321c3c0

am: caf745ea13 Change-Id: If59b408370dccd5d77fd0adab038307c51c76a58
2018-05-16 16:39:05 -07:00
parent 21d1652158 caf745ea13
commit 11916e00ab
2 changed files with 37 additions and 29 deletions
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -190,7 +190,12 @@ public class SliceBuilderUtils {
     */
    public static CharSequence getSubtitleText(Context context,
            AbstractPreferenceController controller, SliceData sliceData) {
-        CharSequence summaryText;
+        CharSequence summaryText = sliceData.getScreenTitle();
+        if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
+                sliceData.getTitle())) {
+            return summaryText;
+        }
+
        if (controller != null) {
            summaryText = controller.getSummary();