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

Commit a65332d6 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge changes I37279967,I02fe6071 into main 

* changes:
  [RONs] Move right icon to right available space
  Revert "[RON] Fix LargeIcon alignment for RONs"
parents 5b7714a3 8b43a111

core/res/res/layout/notification_2025_template_header.xml

+4 −22
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@id/expand_button_container"

        android:layout_toStartOf="@id/expand_button"

        android:layout_alignWithParentIfMissing="true"

        android:layout_marginVertical="@dimen/notification_2025_margin"

        android:clipChildren="false"
@@ -81,30 +81,12 @@ 
        android:focusable="false"

        />





    <LinearLayout

        android:id="@+id/expand_button_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

        android:orientation="vertical"

        >

        <FrameLayout

            android:id="@+id/expand_button_spacer"

            android:layout_width="@dimen/notification_2025_expand_button_pill_width"

            android:layout_height="@dimen/notification_2025_expand_button_pill_height"

            android:layout_centerVertical="true"

            android:layout_alignParentEnd="true"

            android:layout_margin="@dimen/notification_2025_margin"

            android:visibility="gone" />



    <include layout="@layout/notification_2025_expand_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|end"

        android:layout_alignParentEnd="true" />



    </LinearLayout>

    <include layout="@layout/notification_close_button"

        android:id="@+id/close_button"

        android:layout_width="@dimen/notification_close_button_size"

core/res/res/layout/notification_template_header.xml

+4 −20
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
        android:layout_height="match_parent"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_toStartOf="@id/expand_button_container"

        android:layout_toStartOf="@id/expand_button"

        android:layout_alignWithParentIfMissing="true"

        android:clipChildren="false"

        android:gravity="center_vertical"
@@ -83,28 +83,12 @@ 
        android:focusable="false"

        />



    <LinearLayout

        android:id="@+id/expand_button_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

        android:orientation="vertical"

        >

        <FrameLayout

            android:id="@+id/expand_button_spacer"

            android:layout_width="@dimen/notification_expand_button_pill_height"

            android:layout_height="@dimen/notification_header_height"

            android:layout_centerVertical="true"

            android:layout_alignParentEnd="true"

            android:layout_marginHorizontal="16dp"

            android:visibility="gone" />



    <include layout="@layout/notification_expand_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentEnd="true" />

    </LinearLayout>



    <include layout="@layout/notification_close_button"

        android:id="@+id/close_button"

        android:layout_width="@dimen/notification_close_button_size"

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -3237,8 +3237,6 @@ 
  <java-symbol type="id" name="header_text" />

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

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

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

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

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

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

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

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

+4 −3
Original line number Diff line number Diff line
@@ -998,6 +998,10 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
            entry.setPromotedNotificationContentModel(result.mPromotedContent);

        }



        if (PromotedNotificationUiForceExpanded.isEnabled()) {

            row.setPromotedOngoing(entry.isOngoingPromoted());

        }



        boolean setRepliesAndActions = true;

        if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) {

            if (result.inflatedContentView != null) {
@@ -1130,9 +1134,6 @@ public class NotificationContentInflater implements NotificationRowContentBinder 


        entry.setHeadsUpStatusBarText(result.headsUpStatusBarText);

        entry.setHeadsUpStatusBarTextPublic(result.headsUpStatusBarTextPublic);

        if (PromotedNotificationUiForceExpanded.isEnabled()) {

            row.setPromotedOngoing(entry.isOngoingPromoted());

        }



        Trace.endAsyncSection(APPLY_TRACE_METHOD, System.identityHashCode(row));

        if (endListener != null) {

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

+0 −10
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.ViewGroup; 
import android.view.animation.Interpolator;

import android.view.animation.PathInterpolator;

import android.widget.DateTimeView;

import android.widget.FrameLayout;

import android.widget.ImageButton;

import android.widget.ImageView;

import android.widget.TextView;
@@ -42,7 +41,6 @@ import com.android.app.animation.Interpolators; 
import com.android.internal.widget.CachingIconView;

import com.android.internal.widget.NotificationCloseButton;

import com.android.internal.widget.NotificationExpandButton;

import com.android.systemui.Flags;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.TransformableView;

import com.android.systemui.statusbar.ViewTransformationHelper;
@@ -69,7 +67,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper imple 
    private CachingIconView mIcon;

    private NotificationCloseButton mCloseButton;

    private NotificationExpandButton mExpandButton;

    private FrameLayout mExpandButtonSpacer;

    private View mAltExpandTarget;

    private View mIconContainer;

    protected NotificationHeaderView mNotificationHeader;
@@ -157,10 +154,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper imple 
        mHeaderText = mView.findViewById(com.android.internal.R.id.header_text);

        mAppNameText = mView.findViewById(com.android.internal.R.id.app_name_text);

        mExpandButton = mView.findViewById(com.android.internal.R.id.expand_button);

        if (Flags.uiRichOngoingForceExpanded()) {

            mExpandButtonSpacer =

                    mView.findViewById(com.android.internal.R.id.expand_button_spacer);

        }

        mAltExpandTarget = mView.findViewById(com.android.internal.R.id.alternate_expand_target);

        mIconContainer = mView.findViewById(com.android.internal.R.id.conversation_icon_container);

        mWorkProfileImage = mView.findViewById(com.android.internal.R.id.profile_badge);
@@ -302,9 +295,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper imple 
            boolean expandable,

            View.OnClickListener onClickListener,

            boolean requestLayout) {

        if (Flags.uiRichOngoingForceExpanded() && mExpandButtonSpacer != null) {

            mExpandButtonSpacer.setVisibility(expandable ? GONE : VISIBLE);

        }

        mExpandButton.setVisibility(expandable ? VISIBLE : GONE);

        mExpandButton.setOnClickListener(expandable ? onClickListener : null);

        if (mAltExpandTarget != null) {