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

Commit 88887fe7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7542710 from 0c94b529 to sc-release 

Change-Id: I8a401a487a043b862cea662f1f39c936692c7c51
parents 12f9c7a9 0c94b529

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShimPriv_apk.asciipb

+1 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7533747"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShimPriv.apk"

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__arm_CtsShim_apk.asciipb

+1 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7533747"

    target: "CtsShim"

    source_file: "aosp_arm64/CtsShim.apk"

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShimPriv_apk.asciipb

+1 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7533747"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShimPriv.apk"

  }

.prebuilt_info/prebuilt_info_packages_CtsShim_apk__x86_CtsShim_apk.asciipb

+1 −1
Original line number Diff line number Diff line 
drops {

  android_build_drop {

    build_id: "7471822"

    build_id: "7533747"

    target: "CtsShim"

    source_file: "aosp_x86_64/CtsShim.apk"

  }

core/java/android/app/Notification.java

+5 −4
Original line number Diff line number Diff line
@@ -5380,14 +5380,15 @@ public class Notification implements Parcelable 


        private void bindExpandButton(RemoteViews contentView, StandardTemplateParams p) {

            // set default colors

            int textColor = getPrimaryTextColor(p);

            int pillColor = getColors(p).getProtectionColor();

            int bgColor = getBackgroundColor(p);

            int pillColor = Colors.flattenAlpha(getColors(p).getProtectionColor(), bgColor);

            int textColor = Colors.flattenAlpha(getPrimaryTextColor(p), pillColor);

            contentView.setInt(R.id.expand_button, "setDefaultTextColor", textColor);

            contentView.setInt(R.id.expand_button, "setDefaultPillColor", pillColor);

            // Use different highlighted colors for conversations' unread count

            if (p.mHighlightExpander) {

                textColor = getBackgroundColor(p);

                pillColor = getPrimaryAccentColor(p);

                pillColor = Colors.flattenAlpha(getPrimaryAccentColor(p), bgColor);

                textColor = Colors.flattenAlpha(bgColor, pillColor);

            }

            contentView.setInt(R.id.expand_button, "setHighlightTextColor", textColor);

            contentView.setInt(R.id.expand_button, "setHighlightPillColor", pillColor);