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

Commit 9ac3edc4 authored by Selim Cinek's avatar Selim Cinek
Browse files

Decrease avatar and sender name sizes in MessagingStyle 

This reverts commit a738ca41.

Addressed this with new messaging layout

Bug: 150905003
Test: add messaging notification, observe normal sizes
Change-Id: I69b33b0c30a3237b16a23632b9151015572298f8
parent 2f7f7b88

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,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">52dp</dimen>

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

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

    <!-- Start of the content in the conversation template -->

    <dimen name="conversation_content_start">80dp</dimen>

core/res/res/values/styles_device_defaults.xml

+1 −4
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.MessagingName</item>

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

    </style>

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

    <style name="Widget.DeviceDefault.ProgressBar.Inverse" parent="Widget.Material.ProgressBar.Inverse"/>
@@ -290,9 +290,6 @@ 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

+0 −3
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ 
    <!-- 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

+0 −10
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 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;
@@ -151,7 +150,6 @@ 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;
@@ -640,16 +638,10 @@ 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 {
@@ -1641,8 +1633,6 @@ 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,