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

Commit 8310ae8b authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Fix conversations not inflating with app icon flag on" into main

parents 64412549 d0ed6e8b

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

+8 −3
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ import android.util.AttributeSet; 
import android.view.RemotableViewMethod;

import android.widget.RemoteViews;



import com.android.internal.R;



/**

 * An image view that holds the icon displayed on the left side of a notification row.

 * An image view that holds the icon displayed at the start of a notification row.

 */

@RemoteViews.RemoteView

public class NotificationRowIconView extends CachingIconView {
@@ -98,9 +100,12 @@ public class NotificationRowIconView extends CachingIconView { 
                setPadding(0, 0, 0, 0);



                // Make the background white in case the icon itself doesn't have one.

                int white = Color.rgb(255, 255, 255);

                ColorFilter colorFilter = new PorterDuffColorFilter(white,

                ColorFilter colorFilter = new PorterDuffColorFilter(Color.WHITE,

                        PorterDuff.Mode.SRC_ATOP);



                if (mOriginalBackground == null) {

                    setBackground(getContext().getDrawable(R.drawable.notification_icon_circle));

                }

                getBackground().mutate().setColorFilter(colorFilter);

            } else {

                // Restore original padding and background if needed

core/res/res/layout/notification_template_conversation_icon_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
                android:scaleType="center"

                />



            <com.android.internal.widget.CachingIconView

            <com.android.internal.widget.NotificationRowIconView

                android:id="@+id/icon"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

core/res/res/values/symbols.xml

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

  <java-symbol type="dimen" name="text_size_body_2_material" />

  <java-symbol type="dimen" name="notification_icon_circle_size" />

  <java-symbol type="drawable" name="notification_icon_circle" />

  <java-symbol type="dimen" name="messaging_avatar_size" />

  <java-symbol type="dimen" name="messaging_group_sending_progress_size" />

  <java-symbol type="dimen" name="messaging_image_rounding" />