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

Commit a435b2be authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev am: 7b27da1d 

Change-Id: I66bf60a3bbe7c7be13291ad67ac937347bb0d32c
parents b693945b 7b27da1d

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ 
    <!-- The size of the right icon image when on low ram -->

    <dimen name="notification_right_icon_size_low_ram">@dimen/notification_right_icon_size</dimen>



    <dimen name="messaging_avatar_size">@dimen/notification_right_icon_size</dimen>

    <dimen name="messaging_avatar_size">52dp</dimen>



    <dimen name="messaging_group_sending_progress_size">24dp</dimen>

core/res/res/values/styles_device_defaults.xml

+4 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ easier. 
        <item name="textAppearance">@style/TextAppearance.DeviceDefault.Notification</item>

    </style>

    <style name="Widget.DeviceDefault.Notification.MessagingName" parent="Widget.Material.Notification.MessagingName">

        <item name="textAppearance">@style/TextAppearance.DeviceDefault.Notification.Title</item>

        <item name="textAppearance">@style/TextAppearance.DeviceDefault.Notification.MessagingName</item>

    </style>

    <style name="Widget.DeviceDefault.PreferenceFrameLayout" parent="Widget.Material.PreferenceFrameLayout"/>

    <style name="Widget.DeviceDefault.ProgressBar.Inverse" parent="Widget.Material.ProgressBar.Inverse"/>
@@ -290,6 +290,9 @@ easier. 
    <style name="TextAppearance.DeviceDefault.Notification.Title" parent="TextAppearance.Material.Notification.Title">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.MessagingName" parent="TextAppearance.DeviceDefault.Notification.Title">

        <item name="textSize">16sp</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Reply" parent="TextAppearance.Material.Notification.Reply">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ 
    <!-- Increased height of a collapsed media notification in the status bar -->

    <dimen name="notification_min_height_media">160dp</dimen>



    <!-- Increased height of a collapsed messaging notification in the status bar -->

    <dimen name="notification_min_height_messaging">118dp</dimen>



    <!-- Height of a small notification in the status bar which was used before android N -->

    <dimen name="notification_min_height_legacy">64dp</dimen>

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

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.animation.ObjectAnimator; 
import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;

import android.app.NotificationChannel;

import android.content.Context;

import android.content.pm.PackageInfo;
@@ -148,6 +149,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private int mNotificationMinHeight;

    private int mNotificationMinHeightLarge;

    private int mNotificationMinHeightMedia;

    private int mNotificationMinHeightMessaging;

    private int mNotificationMaxHeight;

    private int mIncreasedPaddingBetweenElements;

    private int mNotificationLaunchHeight;
@@ -630,10 +632,16 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                && expandedView.findViewById(com.android.internal.R.id.media_actions) != null;

        boolean showCompactMediaSeekbar = mMediaManager.getShowCompactMediaSeekbar();



        Class<? extends Notification.Style> style =

                mEntry.getSbn().getNotification().getNotificationStyle();

        boolean isMessagingLayout = Notification.MessagingStyle.class.equals(style);



        if (customView && beforeP && !mIsSummaryWithChildren) {

            minHeight = beforeN ? mNotificationMinHeightBeforeN : mNotificationMinHeightBeforeP;

        } else if (isMediaLayout && showCompactMediaSeekbar) {

            minHeight = mNotificationMinHeightMedia;

        } else if (isMessagingLayout) {

            minHeight = mNotificationMinHeightMessaging;

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

            minHeight = mNotificationMinHeightLarge;

        } else {
@@ -1635,6 +1643,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                R.dimen.notification_min_height_increased);

        mNotificationMinHeightMedia = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_min_height_media);

        mNotificationMinHeightMessaging = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_min_height_messaging);

        mNotificationMaxHeight = NotificationUtils.getFontScaledHeight(mContext,

                R.dimen.notification_max_height);

        mMaxHeadsUpHeightBeforeN = NotificationUtils.getFontScaledHeight(mContext,