Allowing the notification to be a bit bigger for the remote input history
This also fixed the squishing when heads-upped by only allowing
one remote input text to be visible when heads upped.
Change-Id: I0c77931233b452420dee4dcf4772092d96d214c9
Fixes: 78877946
Test: add inbox style with 6 entries, reply a few times, observe no squishing
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 526888d..ebd416c 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4902,7 +4902,8 @@
CharSequence[] replyText = mN.extras.getCharSequenceArray(EXTRA_REMOTE_INPUT_HISTORY);
if (!p.ambient && validRemoteInput && replyText != null
- && replyText.length > 0 && !TextUtils.isEmpty(replyText[0])) {
+ && replyText.length > 0 && !TextUtils.isEmpty(replyText[0])
+ && p.maxRemoteInputHistory > 0) {
boolean showSpinner = mN.extras.getBoolean(EXTRA_SHOW_REMOTE_INPUT_SPINNER);
big.setViewVisibility(R.id.notification_material_reply_container, View.VISIBLE);
big.setViewVisibility(R.id.notification_material_reply_text_1_container,
@@ -4917,13 +4918,15 @@
ColorStateList.valueOf(
isColorized() ? getPrimaryTextColor() : resolveContrastColor()));
- if (replyText.length > 1 && !TextUtils.isEmpty(replyText[1])) {
+ if (replyText.length > 1 && !TextUtils.isEmpty(replyText[1])
+ && p.maxRemoteInputHistory > 1) {
big.setViewVisibility(R.id.notification_material_reply_text_2, View.VISIBLE);
big.setTextViewText(R.id.notification_material_reply_text_2,
processTextSpans(replyText[1]));
setTextViewColorSecondary(big, R.id.notification_material_reply_text_2);
- if (replyText.length > 2 && !TextUtils.isEmpty(replyText[2])) {
+ if (replyText.length > 2 && !TextUtils.isEmpty(replyText[2])
+ && p.maxRemoteInputHistory > 2) {
big.setViewVisibility(
R.id.notification_material_reply_text_3, View.VISIBLE);
big.setTextViewText(R.id.notification_material_reply_text_3,
@@ -5086,7 +5089,13 @@
return null;
}
- return applyStandardTemplateWithActions(getBigBaseLayoutResource(), null /* result */);
+ // We only want at most a single remote input history to be shown here, otherwise
+ // the content would become squished.
+ StandardTemplateParams p = mParams.reset().fillTextsFrom(this)
+ .setMaxRemoteInputHistory(1);
+ return applyStandardTemplateWithActions(getBigBaseLayoutResource(),
+ p,
+ null /* result */);
}
/**
@@ -5955,6 +5964,12 @@
* object.
*/
public static abstract class Style {
+
+ /**
+ * The number of items allowed simulatanously in the remote input history.
+ * @hide
+ */
+ static final int MAX_REMOTE_INPUT_HISTORY_LINES = 3;
private CharSequence mBigContentTitle;
/**
@@ -7414,6 +7429,11 @@
* @see Notification#bigContentView
*/
public static class InboxStyle extends Style {
+
+ /**
+ * The number of lines of remote input history allowed until we start reducing lines.
+ */
+ private static final int NUMBER_OF_HISTORY_ALLOWED_UNTIL_REDUCTION = 1;
private ArrayList<CharSequence> mTexts = new ArrayList<CharSequence>(5);
public InboxStyle() {
@@ -7513,6 +7533,28 @@
if (mBuilder.mActions.size() > 0) {
maxRows--;
}
+ CharSequence[] remoteInputHistory = mBuilder.mN.extras.getCharSequenceArray(
+ EXTRA_REMOTE_INPUT_HISTORY);
+ if (remoteInputHistory != null
+ && remoteInputHistory.length > NUMBER_OF_HISTORY_ALLOWED_UNTIL_REDUCTION) {
+ // Let's remove some messages to make room for the remote input history.
+ // 1 is always able to fit, but let's remove them if they are 2 or 3
+ int numRemoteInputs = Math.min(remoteInputHistory.length,
+ MAX_REMOTE_INPUT_HISTORY_LINES);
+ int totalNumRows = mTexts.size() + numRemoteInputs
+ - NUMBER_OF_HISTORY_ALLOWED_UNTIL_REDUCTION;
+ if (totalNumRows > maxRows) {
+ int overflow = totalNumRows - maxRows;
+ if (mTexts.size() > maxRows) {
+ // Heuristic: if the Texts don't fit anyway, we'll rather drop the last
+ // few messages, even with the remote input
+ maxRows -= overflow;
+ } else {
+ // otherwise we drop the first messages
+ i = overflow;
+ }
+ }
+ }
while (i < mTexts.size() && i < maxRows) {
CharSequence str = mTexts.get(i);
if (!TextUtils.isEmpty(str)) {
@@ -9583,6 +9625,7 @@
CharSequence title;
CharSequence text;
CharSequence headerTextSecondary;
+ int maxRemoteInputHistory = Style.MAX_REMOTE_INPUT_HISTORY_LINES;
boolean hideLargeIcon;
boolean hideReplyIcon;
@@ -9592,6 +9635,7 @@
title = null;
text = null;
headerTextSecondary = null;
+ maxRemoteInputHistory = Style.MAX_REMOTE_INPUT_HISTORY_LINES;
return this;
}
@@ -9643,5 +9687,15 @@
this.text = b.processLegacyText(text, ambient);
return this;
}
+
+ /**
+ * Set the maximum lines of remote input history lines allowed.
+ * @param maxRemoteInputHistory The number of lines.
+ * @return The builder for method chaining.
+ */
+ public StandardTemplateParams setMaxRemoteInputHistory(int maxRemoteInputHistory) {
+ this.maxRemoteInputHistory = maxRemoteInputHistory;
+ return this;
+ }
}
}
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 8c3cc42..cbddaa2 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -960,6 +960,10 @@
add about 88dp of height to the notifications. -->
<dimen name="smart_reply_button_max_height">100dp</dimen>
+ <!-- The extra height that we allow a notification with a remote input history to be taller than
+ the regular notification, when we have remote input history texts present. -->
+ <dimen name="remote_input_history_extra_height">60dp</dimen>
+
<!-- Fingerprint Dialog values -->
<dimen name="fingerprint_dialog_fp_icon_size">64dp</dimen>
<dimen name="fingerprint_dialog_animation_translation_offset">350dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 724bd22..671b451 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -189,6 +189,7 @@
if (mExpandedSmartReplyView != null) {
notificationMaxHeight += mExpandedSmartReplyView.getHeightUpperLimit();
}
+ notificationMaxHeight += mExpandedWrapper.getExtraMeasureHeight();
int size = notificationMaxHeight;
ViewGroup.LayoutParams layoutParams = mExpandedChild.getLayoutParams();
boolean useExactly = false;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
index 2d983c4..03791c7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
@@ -34,6 +34,7 @@
import com.android.internal.util.NotificationColorUtil;
import com.android.internal.widget.NotificationActionListLayout;
import com.android.systemui.Dependency;
+import com.android.systemui.R;
import com.android.systemui.UiOffloadThread;
import com.android.systemui.statusbar.CrossFadeHelper;
import com.android.systemui.statusbar.ExpandableNotificationRow;
@@ -58,6 +59,7 @@
private NotificationActionListLayout mActions;
private ArraySet<PendingIntent> mCancelledPendingIntents = new ArraySet<>();
private UiOffloadThread mUiOffloadThread;
+ private View mRemoteInputHistory;
protected NotificationTemplateViewWrapper(Context ctx, View view,
ExpandableNotificationRow row) {
@@ -146,6 +148,8 @@
mActionsContainer = mView.findViewById(com.android.internal.R.id.actions_container);
mActions = mView.findViewById(com.android.internal.R.id.actions);
mReplyAction = mView.findViewById(com.android.internal.R.id.reply_icon_action);
+ mRemoteInputHistory = mView.findViewById(
+ com.android.internal.R.id.notification_material_reply_container);
updatePendingIntentCancellations();
}
@@ -329,6 +333,10 @@
if (mActions != null) {
extra = mActions.getExtraMeasureHeight();
}
+ if (mRemoteInputHistory != null && mRemoteInputHistory.getVisibility() != View.GONE) {
+ extra += mRow.getContext().getResources().getDimensionPixelSize(
+ R.dimen.remote_input_history_extra_height);
+ }
return extra + super.getExtraMeasureHeight();
}
}