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

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

Merge "Color and text changes" into pi-dev 

am: 03ddb28c

Change-Id: I0d66ab47686ef3d63d5a18bef890891a66261203
parents 51a5fe93 03ddb28c

core/java/android/app/Notification.java

+4 −3
Original line number Diff line number Diff line
@@ -4574,13 +4574,14 @@ public class Notification implements Parcelable 
                bindHeaderChronometerAndTime(contentView);

                bindProfileBadge(contentView);

            }

            bindActivePermissions(contentView);

            bindActivePermissions(contentView, ambient);

            bindExpandButton(contentView);

            mN.mUsesStandardHeader = true;

        }



        private void bindActivePermissions(RemoteViews contentView) {

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

        private void bindActivePermissions(RemoteViews contentView, boolean ambient) {

            int color = ambient ? resolveAmbientColor()

                    : isColorized() ? getPrimaryTextColor() : resolveContrastColor();

            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);

packages/SystemUI/res/layout/volume_dialog.xml

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

                    android:contentDescription="@string/accessibility_volume_settings"

                    android:background="@drawable/ripple_drawable_20dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tint="?android:attr/textColorHint"

                    android:soundEffectsEnabled="false" />

            </FrameLayout>

        </LinearLayout>

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ 
    </plurals>



    <string name="notification_appops_settings">Settings</string>

    <string name="notification_appops_ok">Ok</string>

    <string name="notification_appops_ok">OK</string>



    <!-- Notification: Control panel: Accessibility description for expanded inline controls view, used

        to control settings about notifications related to the current notification.  -->