From 3a2c4b9d52c0002854c3cdab136403f8124346e6 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Thu, 17 Dec 2015 17:01:17 -0800 Subject: [PATCH] Fixed the maximum number of lines for the bigtext view Since the summary is now in the header, we can allow one more line in bigtext. Also made it look nicer if the bigtext was empty, in case we always want to use bigtext by default. Change-Id: I13679de084757ef174b3bf53e75837a4d95ddc99 --- core/java/android/app/Notification.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index c008c1f8b84b9..3ff0896594567 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3917,8 +3917,7 @@ public class Notification implements Parcelable public static class BigTextStyle extends Style { private static final int MAX_LINES = 13; - private static final int LINES_CONSUMED_BY_ACTIONS = 3; - private static final int LINES_CONSUMED_BY_SUMMARY = 2; + private static final int LINES_CONSUMED_BY_ACTIONS = 4; private CharSequence mBigText; @@ -3988,8 +3987,10 @@ public class Notification implements Parcelable mBuilder.getAllExtras().putCharSequence(EXTRA_TEXT, oldBuilderContentText); - contentView.setTextViewText(R.id.big_text, mBuilder.processLegacyText(mBigText)); - contentView.setViewVisibility(R.id.big_text, View.VISIBLE); + CharSequence bigTextText = mBuilder.processLegacyText(mBigText); + contentView.setTextViewText(R.id.big_text, bigTextText); + contentView.setViewVisibility(R.id.big_text, + TextUtils.isEmpty(bigTextText) ? View.GONE : View.VISIBLE); contentView.setInt(R.id.big_text, "setMaxLines", calculateMaxLines()); mBuilder.addProfileBadge(contentView, R.id.profile_badge_large_template); @@ -4002,14 +4003,9 @@ public class Notification implements Parcelable private int calculateMaxLines() { int lineCount = MAX_LINES; boolean hasActions = mBuilder.mActions.size() > 0; - boolean hasSummary = (mSummaryTextSet ? mSummaryText - : mBuilder.getAllExtras().getCharSequence(EXTRA_SUB_TEXT)) != null; if (hasActions) { lineCount -= LINES_CONSUMED_BY_ACTIONS; } - if (hasSummary) { - lineCount -= LINES_CONSUMED_BY_SUMMARY; - } return lineCount; } }