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

Commit 42a0d2ef authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Use android:clipToOutline in notification templates." into sc-dev

parents 6a0f8b2b a1e1249e

core/res/res/layout/notification_template_header.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
        android:layout_gravity="center_vertical|start"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:background="@drawable/notification_large_icon_outline"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"

        android:importantForAccessibility="no"

        android:scaleType="centerCrop"

        android:scaleType="centerCrop"

        android:visibility="gone"

        android:visibility="gone"

core/res/res/layout/notification_template_material_base.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:layout_gravity="center_vertical|start"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:background="@drawable/notification_large_icon_outline"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"

        android:importantForAccessibility="no"

        android:scaleType="centerCrop"

        android:scaleType="centerCrop"

        android:visibility="gone"

        android:visibility="gone"
@@ -54,6 +55,7 @@ 
        android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin"

        android:layout_marginBottom="@dimen/notification_right_icon_headerless_margin"

        android:layout_marginEnd="@dimen/notification_header_expand_icon_size"

        android:layout_marginEnd="@dimen/notification_header_expand_icon_size"

        android:background="@drawable/notification_large_icon_outline"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"

        android:importantForAccessibility="no"

        android:scaleType="centerCrop"

        android:scaleType="centerCrop"

        />

        />

core/res/res/layout/notification_template_material_big_picture.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ 
            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:background="@drawable/notification_big_picture_outline"

            android:background="@drawable/notification_big_picture_outline"

            android:clipToOutline="true"

            android:scaleType="centerCrop"

            android:scaleType="centerCrop"

            />

            />

core/res/res/layout/notification_template_right_icon.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_marginEnd="@dimen/notification_header_expand_icon_size"

    android:layout_marginEnd="@dimen/notification_header_expand_icon_size"

    android:layout_marginTop="@dimen/notification_right_icon_big_margin_top"

    android:layout_marginTop="@dimen/notification_right_icon_big_margin_top"

    android:background="@drawable/notification_large_icon_outline"

    android:background="@drawable/notification_large_icon_outline"

    android:clipToOutline="true"

    android:importantForAccessibility="no"

    android:importantForAccessibility="no"

    android:scaleType="centerCrop"

    android:scaleType="centerCrop"

    />
 
    />

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -40,8 +40,6 @@ public class NotificationBigPictureTemplateViewWrapper extends NotificationTempl 
    public void onContentUpdated(ExpandableNotificationRow row) {

    public void onContentUpdated(ExpandableNotificationRow row) {

        super.onContentUpdated(row);

        super.onContentUpdated(row);

        updateImageTag(row.getEntry().getSbn());

        updateImageTag(row.getEntry().getSbn());

        // Round the corners of the big picture content

        mView.findViewById(com.android.internal.R.id.big_picture).setClipToOutline(true);

    }

    }





    private void updateImageTag(StatusBarNotification notification) {

    private void updateImageTag(StatusBarNotification notification) {