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

Commit 6e2c6ccd authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Media notifications may not have an icon"

parents acec8ad6 fdc738f9

core/java/android/app/Notification.java

+11 −1
Original line number Diff line number Diff line
@@ -4384,7 +4384,17 @@ public class Notification implements Parcelable 
                    view.addView(com.android.internal.R.id.media_actions, button);

                }

            }

            handleImage(view  /* addPaddingToMainColumn */);

            handleImage(view);

            // handle the content margin

            int endMargin;

            if (mBuilder.mN.mLargeIcon != null) {

                endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(

                        R.dimen.notification_content_picture_margin_media);

            } else {

                endMargin = mBuilder.mContext.getResources().getDimensionPixelSize(

                        R.dimen.notification_content_margin_end);

            }

            view.setViewLayoutMarginEnd(R.id.notification_main_column, endMargin);

            return view;

        }

core/res/res/layout/notification_template_material_media.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
        android:orientation="horizontal"

        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginEnd="72dp"

        android:tag="media"

        >

        <LinearLayout

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ 
    <!-- The margin on the end of the content view with a picture.-->

    <dimen name="notification_content_picture_margin">56dp</dimen>



    <!-- The margin on the end of the content view with a picture in the compact media.-->

    <dimen name="notification_content_picture_margin_media">72dp</dimen>



    <!-- height of the content margin to accomodate for the header -->

    <dimen name="notification_content_margin_top">30dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,7 @@ 
  <java-symbol type="dimen" name="media_notification_expanded_image_max_size" />

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

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

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



  <java-symbol type="bool" name="config_strongAuthRequiredOnBoot" />