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

Commit 79487716 authored by Selim Cinek's avatar Selim Cinek Committed by Automerger Merge Worker
Browse files

Merge changes I7dc8f5fd,Ia5262ca7 into rvc-dev am: 279238f3 

Change-Id: I24abe6eee081c480905df7f1866d4fa1076f402c
parents 1e904972 279238f3

core/java/android/app/Notification.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -7589,10 +7589,8 @@ public class Notification implements Parcelable 
                    >= Build.VERSION_CODES.P;

                    >= Build.VERSION_CODES.P;

            boolean isOneToOne;

            boolean isOneToOne;

            CharSequence nameReplacement = null;

            CharSequence nameReplacement = null;

            Icon avatarReplacement = null;

            if (!atLeastP) {

            if (!atLeastP) {

                isOneToOne = TextUtils.isEmpty(conversationTitle);

                isOneToOne = TextUtils.isEmpty(conversationTitle);

                avatarReplacement = mBuilder.mN.mLargeIcon;

                if (hasOnlyWhiteSpaceSenders()) {

                if (hasOnlyWhiteSpaceSenders()) {

                    isOneToOne = true;

                    isOneToOne = true;

                    nameReplacement = conversationTitle;

                    nameReplacement = conversationTitle;
@@ -7641,7 +7639,7 @@ public class Notification implements Parcelable 
            contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsCollapsed",

            contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsCollapsed",

                    isCollapsed);

                    isCollapsed);

            contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement",

            contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement",

                    avatarReplacement);

                    mBuilder.mN.mLargeIcon);

            contentView.setCharSequence(R.id.status_bar_latest_event_content, "setNameReplacement",

            contentView.setCharSequence(R.id.status_bar_latest_event_content, "setNameReplacement",

                    nameReplacement);

                    nameReplacement);

            contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsOneToOne",

            contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsOneToOne",

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper { 
    @Override

    @Override

    public void onContentUpdated(ExpandableNotificationRow row) {

    public void onContentUpdated(ExpandableNotificationRow row) {

        super.onContentUpdated(row);

        super.onContentUpdated(row);

        mIsLowPriority = row.isLowPriority();

        mIsLowPriority = row.getEntry().isAmbient();

        mTransformLowPriorityTitle = !row.isChildInGroup() && !row.isSummaryWithChildren();

        mTransformLowPriorityTitle = !row.isChildInGroup() && !row.isSummaryWithChildren();

        ArraySet<View> previousViews = mTransformationHelper.getAllTransformingViews();

        ArraySet<View> previousViews = mTransformationHelper.getAllTransformingViews();