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

Commit fa4994e1 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Change Notification expander to use 10% opaque foreground color" into... 

Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: 745b7dca

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24405286



Change-Id: Ia9daf2b103e562891356bf638bfa097b283add83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 728bf8b8 745b7dca

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.ViewOutlineProvider; 
import android.widget.ImageView;

import android.widget.TextView;



import androidx.core.graphics.ColorUtils;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -176,7 +177,8 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity { 
                    com.android.internal.R.id.expand_button);

            int textColor = obtainThemeColor(android.R.attr.textColorPrimary);

            int backgroundColor = obtainThemeColor(android.R.attr.colorBackgroundFloating);

            expand.setDefaultPillColor(backgroundColor);

            int pillColor = ColorUtils.blendARGB(textColor, backgroundColor, 0.9f);

            expand.setDefaultPillColor(pillColor);

            expand.setDefaultTextColor(textColor);

            expand.setExpanded(false);

            header.setStateDescription(container.getVisibility() == View.VISIBLE