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

Merge "Let CallStyle notifications be any height." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-03-10 21:11:45 +00:00
committed by Android (Google) Code Review
parent bbcb857d3a b9dccf5a77
commit 852a4a7bb5
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -167,10 +167,6 @@
and the notification won't use this much, but is measured with wrap_content --> and the notification won't use this much, but is measured with wrap_content -->
<dimen name="notification_messaging_actions_min_height">196dp</dimen> <dimen name="notification_messaging_actions_min_height">196dp</dimen>
<!-- Height of a call notification. Note that this is an upper bound
and the notification won't use this much, but is measured with wrap_content -->
<dimen name="call_notification_full_height">172dp</dimen>
<!-- a threshold in dp per second that is considered fast scrolling --> <!-- a threshold in dp per second that is considered fast scrolling -->
<dimen name="scroll_fast_threshold">1500dp</dimen> <dimen name="scroll_fast_threshold">1500dp</dimen>

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
View File

@@ -166,7 +166,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
private int mMaxSmallHeightLarge; private int mMaxSmallHeightLarge;
private int mMaxSmallHeightMedia; private int mMaxSmallHeightMedia;
private int mMaxExpandedHeight; private int mMaxExpandedHeight;
private int mMaxCallHeight;
private int mIncreasedPaddingBetweenElements; private int mIncreasedPaddingBetweenElements;
private int mNotificationLaunchHeight; private int mNotificationLaunchHeight;
private boolean mMustStayOnScreen; private boolean mMustStayOnScreen;
@@ -687,7 +686,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
// them a headerless design, then remove this hack. // them a headerless design, then remove this hack.
smallHeight = mMaxSmallHeightLarge; smallHeight = mMaxSmallHeightLarge;
} else if (isCallLayout) { } else if (isCallLayout) {
smallHeight = mMaxCallHeight; smallHeight = mMaxExpandedHeight;
} else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) { } else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) {
smallHeight = mMaxSmallHeightLarge; smallHeight = mMaxSmallHeightLarge;
} else { } else {
@@ -1621,8 +1620,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
R.dimen.notification_min_height_media); R.dimen.notification_min_height_media);
mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext, mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_max_height); R.dimen.notification_max_height);
mMaxCallHeight = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.call_notification_full_height);
mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext, mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,
R.dimen.notification_max_heads_up_height_legacy); R.dimen.notification_max_heads_up_height_legacy);
mMaxHeadsUpHeightBeforeP = NotificationUtils.getFontScaledHeight(mContext, mMaxHeadsUpHeightBeforeP = NotificationUtils.getFontScaledHeight(mContext,

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationCallTemplateViewWrapper.kt
View File

@@ -34,7 +34,7 @@ class NotificationCallTemplateViewWrapper constructor(
) : NotificationTemplateViewWrapper(ctx, view, row) { ) : NotificationTemplateViewWrapper(ctx, view, row) {
private val minHeightWithActions: Int = private val minHeightWithActions: Int =
NotificationUtils.getFontScaledHeight(ctx, R.dimen.call_notification_full_height) NotificationUtils.getFontScaledHeight(ctx, R.dimen.notification_max_height)
private val callLayout: CallLayout = view as CallLayout private val callLayout: CallLayout = view as CallLayout
private lateinit var conversationIconView: CachingIconView private lateinit var conversationIconView: CachingIconView