Merge "Use theme color instead of fixed one"

This commit is contained in:
Lucas Dupin
2020-12-02 15:59:56 +00:00
committed by Android (Google) Code Review

View File

@@ -52,6 +52,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
import com.android.internal.util.ContrastColorUtil; import com.android.internal.util.ContrastColorUtil;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.Utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -79,8 +80,8 @@ public class NotificationSbnAdapter extends
mPm = pm; mPm = pm;
mUserBadgeCache = new HashMap<>(); mUserBadgeCache = new HashMap<>();
mValues = new ArrayList<>(); mValues = new ArrayList<>();
mBackgroundColor = mContext.getColor( mBackgroundColor = Utils.getColorAttrDefaultColor(context,
com.android.internal.R.color.notification_material_background_color); android.R.attr.colorBackground);
Configuration currentConfig = mContext.getResources().getConfiguration(); Configuration currentConfig = mContext.getResources().getConfiguration();
mInNightMode = (currentConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK) mInNightMode = (currentConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK)
== Configuration.UI_MODE_NIGHT_YES; == Configuration.UI_MODE_NIGHT_YES;