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

Commit b9e8c4f1 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Ensure colors for active permission icons" into pi-dev am: 46d03c29 

am: f4bf387e

Change-Id: Ifb8cb9e73a6ec2f72a3e83e9202f7f672d8463ee
parents 600ef933 f4bf387e

core/java/android/app/Notification.java

+8 −0
Original line number Diff line number Diff line
@@ -4588,10 +4588,18 @@ public class Notification implements Parcelable 
                bindHeaderChronometerAndTime(contentView);

                bindProfileBadge(contentView);

            }

            bindActivePermissions(contentView);

            bindExpandButton(contentView);

            mN.mUsesStandardHeader = true;

        }



        private void bindActivePermissions(RemoteViews contentView) {

            int color = isColorized() ? getPrimaryTextColor() : getSecondaryTextColor();

            contentView.setDrawableTint(R.id.camera, false, color, PorterDuff.Mode.SRC_ATOP);

            contentView.setDrawableTint(R.id.mic, false, color, PorterDuff.Mode.SRC_ATOP);

            contentView.setDrawableTint(R.id.overlay, false, color, PorterDuff.Mode.SRC_ATOP);

        }



        private void bindExpandButton(RemoteViews contentView) {

            int color = isColorized() ? getPrimaryTextColor() : getSecondaryTextColor();

            contentView.setDrawableTint(R.id.expand_button, false, color,

core/res/res/layout/notification_template_header.xml

+0 −3
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
            android:layout_width="?attr/notificationHeaderIconSize"

            android:layout_height="?attr/notificationHeaderIconSize"

            android:src="@drawable/ic_camera"

            android:tint="@color/notification_secondary_text_color_light"

            android:background="?android:selectableItemBackgroundBorderless"

            android:visibility="gone"

            />
@@ -147,7 +146,6 @@ 
            android:layout_width="?attr/notificationHeaderIconSize"

            android:layout_height="?attr/notificationHeaderIconSize"

            android:src="@drawable/ic_mic"

            android:tint="@color/notification_secondary_text_color_light"

            android:background="?android:selectableItemBackgroundBorderless"

            android:layout_marginStart="4dp"

            android:visibility="gone"
@@ -157,7 +155,6 @@ 
            android:layout_width="?attr/notificationHeaderIconSize"

            android:layout_height="?attr/notificationHeaderIconSize"

            android:src="@drawable/ic_alert_window_layer"

            android:tint="@color/notification_secondary_text_color_light"

            android:background="?android:selectableItemBackgroundBorderless"

            android:layout_marginStart="4dp"

            android:visibility="gone"