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

Commit 577ef793 authored by Steve Elliott's avatar Steve Elliott
Browse files

Update header text color when theme changes 

Fixes: 150157414
Test: manual, atest
Change-Id: I0ae51dc9e171d1984f38db42093e6a94c547f09b
parent 161cdc30

packages/SystemUI/res/layout/people_strip.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
            android:forceHasOverlappingRendering="false">



            <TextView

                android:id="@+id/header_label"

                style="@style/TextAppearance.NotificationSectionHeaderButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.java

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.statusbar.notification.stack.NotificationStac 


import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.ColorInt;

import android.annotation.IntDef;

import android.annotation.LayoutRes;

import android.annotation.NonNull;
@@ -555,6 +556,12 @@ public class NotificationSectionsManager implements StackScrollAlgorithm.Section 
        updateSectionBoundaries();

    }



    void setHeaderForegroundColor(@ColorInt int color) {

        mPeopleHubView.setTextColor(color);

        mGentleHeader.setForegroundColor(color);

        mAlertingHeader.setForegroundColor(color);

    }



    /**

     * For now, declare the available notification buckets (sections) here so that other

     * presentation code can decide what to do based on an entry's buckets

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.TimeAnimator;

import android.animation.ValueAnimator;

import android.annotation.ColorInt;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -4806,7 +4807,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        mUsingLightTheme = lightTheme;

        Context context = new ContextThemeWrapper(mContext,

                lightTheme ? R.style.Theme_SystemUI_Light : R.style.Theme_SystemUI);

        final int textColor = Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor);

        final @ColorInt int textColor =

                Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor);

        mSectionsManager.setHeaderForegroundColor(textColor);

        mFooterView.setTextColor(textColor);

        mEmptyShadeView.setTextColor(textColor);

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/PeopleHubView.kt

+6 −0
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


package com.android.systemui.statusbar.notification.stack



import android.annotation.ColorInt

import android.content.Context

import android.util.AttributeSet

import android.view.View

import android.view.ViewGroup

import android.widget.ImageView

import android.widget.TextView

import com.android.systemui.R

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin

import com.android.systemui.statusbar.notification.people.DataListener
@@ -31,12 +33,14 @@ class PeopleHubView(context: Context, attrs: AttributeSet) : 
        StackScrollerDecorView(context, attrs), SwipeableView {



    private lateinit var contents: ViewGroup

    private lateinit var label: TextView



    lateinit var personViewAdapters: Sequence<DataListener<PersonViewModel?>>

        private set



    override fun onFinishInflate() {

        contents = requireViewById(R.id.people_list)

        label = requireViewById(R.id.header_label)

        personViewAdapters = (0 until contents.childCount)

                .asSequence() // so we can map

                .mapNotNull { idx ->
@@ -49,6 +53,8 @@ class PeopleHubView(context: Context, attrs: AttributeSet) : 
        setVisible(true /* nowVisible */, false /* animate */)

    }



    fun setTextColor(@ColorInt color: Int) = label.setTextColor(color)



    override fun findContentView(): View = contents

    override fun findSecondaryView(): View? = null

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/SectionHeaderView.java

+7 −0
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


package com.android.systemui.statusbar.notification.stack;



import android.annotation.ColorInt;

import android.annotation.Nullable;

import android.annotation.StringRes;

import android.content.Context;

import android.content.res.ColorStateList;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.view.View;
@@ -124,4 +126,9 @@ public class SectionHeaderView extends StackScrollerDecorView { 
        mLabelTextId = resId;

        mLabelView.setText(resId);

    }



    void setForegroundColor(@ColorInt int color) {

        mLabelView.setTextColor(color);

        mClearAllButton.setImageTintList(ColorStateList.valueOf(color));

    }

}