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

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

Merge "Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cac am:... 

Merge "Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cac am: c9e647b2" into rvc-d1-dev-plus-aosp am: e4e72b63

Change-Id: I4ab2149b0b11a20ba6423038d2b8bf8113f9fcc4
parents 4b93be8d e4e72b63

core/java/android/app/Notification.java

+2 −1
Original line number Diff line number Diff line
@@ -7158,7 +7158,8 @@ public class Notification implements Parcelable 
            CharSequence conversationTitle = !TextUtils.isEmpty(super.mBigContentTitle)

                    ? super.mBigContentTitle

                    : mConversationTitle;

            if (!TextUtils.isEmpty(conversationTitle) && !hasOnlyWhiteSpaceSenders()) {

            if (mConversationType == CONVERSATION_TYPE_LEGACY

                    && !TextUtils.isEmpty(conversationTitle) && !hasOnlyWhiteSpaceSenders()) {

                return conversationTitle;

            }

            return null;

core/java/com/android/internal/widget/ConversationLayout.java

+4 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class ConversationLayout extends FrameLayout 
    private CachingIconView mConversationIconBadgeBg;

    private Icon mLargeIcon;

    private View mExpandButtonContainer;

    private View mExpandButtonInnerContainer;

    private ViewGroup mExpandButtonAndContentContainer;

    private NotificationExpandButton mExpandButton;

    private MessagingLinearLayout mImageMessageContainer;
@@ -242,6 +243,7 @@ public class ConversationLayout extends FrameLayout 
        mConversationHeader = findViewById(R.id.conversation_header);

        mContentContainer = findViewById(R.id.notification_action_list_margin_target);

        mExpandButtonAndContentContainer = findViewById(R.id.expand_button_and_content_container);

        mExpandButtonInnerContainer = findViewById(R.id.expand_button_inner_container);

        mExpandButton = findViewById(R.id.expand_button);

        mExpandButtonExpandedTopMargin = getResources().getDimensionPixelSize(

                R.dimen.conversation_expand_button_top_margin_expanded);
@@ -1169,7 +1171,7 @@ public class ConversationLayout extends FrameLayout 
        layoutParams.topMargin = topMargin;

        mExpandButton.setLayoutParams(layoutParams);



        mExpandButtonContainer.setContentDescription(mContext.getText(contentDescriptionId));

        mExpandButtonInnerContainer.setContentDescription(mContext.getText(contentDescriptionId));

    }



    private void updateContentEndPaddings() {
@@ -1213,7 +1215,7 @@ public class ConversationLayout extends FrameLayout 
        mExpandable = expandable;

        if (expandable) {

            mExpandButtonContainer.setVisibility(VISIBLE);

            mExpandButtonContainer.setOnClickListener(onClickListener);

            mExpandButtonInnerContainer.setOnClickListener(onClickListener);

        } else {

            // TODO: handle content paddings to end of layout

            mExpandButtonContainer.setVisibility(GONE);

core/res/res/layout/notification_template_material_conversation.xml

+56 −43
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ 
                    android:id="@+id/notification_messaging"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:minHeight="@dimen/notification_text_size"

                    android:spacing="@dimen/notification_messaging_spacing"

                    android:clipToPadding="false"

                    android:clipChildren="false"
@@ -263,14 +264,25 @@ 
        <include layout="@layout/notification_material_action_list" />

    </com.android.internal.widget.RemeasuringLinearLayout>



    <!--This is dynamically placed between here and at the end of the layout-->

    <LinearLayout

    <!--This is dynamically placed between here and at the end of the layout. It starts here since

        only FrameLayout layout params have gravity-->

    <FrameLayout

        android:id="@+id/expand_button_container"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/conversation_expand_button_size"

        android:layout_height="match_parent"

        android:layout_gravity="end|top"

        android:clipChildren="false"

        android:clipToPadding="false">

        <!--This layout makes sure that we can nicely center the expand content in the

            collapsed layout while the parent makes sure that we're never laid out bigger

            than the messaging content.-->

        <LinearLayout

            android:id="@+id/expand_button_inner_container"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/conversation_expand_button_size"

            android:paddingStart="16dp"

            android:orientation="horizontal"

            android:layout_gravity="end|top"

            android:paddingEnd="@dimen/notification_content_margin_end"

            android:clipToPadding="false"

            android:clipChildren="false"
@@ -312,4 +324,5 @@ 
                android:importantForAccessibility="no"

                />

        </LinearLayout>

    </FrameLayout>

</com.android.internal.widget.ConversationLayout>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3867,6 +3867,7 @@ 
  <java-symbol type="id" name="conversation_icon_badge_ring" />

  <java-symbol type="id" name="conversation_icon_badge_bg" />

  <java-symbol type="id" name="expand_button_container" />

  <java-symbol type="id" name="expand_button_inner_container" />

  <java-symbol type="id" name="messaging_group_content_container" />

  <java-symbol type="id" name="expand_button_and_content_container" />

  <java-symbol type="id" name="conversation_header" />