Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 852a4a7b authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

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

parents bbcb857d b9dccf5a

packages/SystemUI/res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -167,10 +167,6 @@ 
         and the notification won't use this much, but is measured with wrap_content -->

    <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 -->

    <dimen name="scroll_fast_threshold">1500dp</dimen>

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

+1 −4
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private int mMaxSmallHeightLarge;

    private int mMaxSmallHeightMedia;

    private int mMaxExpandedHeight;

    private int mMaxCallHeight;

    private int mIncreasedPaddingBetweenElements;

    private int mNotificationLaunchHeight;

    private boolean mMustStayOnScreen;
@@ -687,7 +686,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            //  them a headerless design, then remove this hack.

            smallHeight = mMaxSmallHeightLarge;

        } else if (isCallLayout) {

            smallHeight = mMaxCallHeight;

            smallHeight = mMaxExpandedHeight;

        } else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) {

            smallHeight = mMaxSmallHeightLarge;

        } else {
@@ -1621,8 +1620,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                R.dimen.notification_min_height_media);

        mMaxExpandedHeight = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_max_height);

        mMaxCallHeight = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.call_notification_full_height);

        mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_max_heads_up_height_legacy);

        mMaxHeadsUpHeightBeforeP = NotificationUtils.getFontScaledHeight(mContext,

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class NotificationCallTemplateViewWrapper constructor( 
) : NotificationTemplateViewWrapper(ctx, view, row) {



    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 lateinit var conversationIconView: CachingIconView