Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the maximum number of lines for the bigtext view

Browse Source 
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
This commit is contained in:
Selim Cinek
2015-12-17 17:01:17 -08:00
parent 98be3f375b
commit 3a2c4b9d52
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/Notification.java
View File

@@ -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;
}
}