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

Commit e708636a authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Automerger Merge Worker
Browse files

Merge "Make aodIconTint default to white." into tm-qpr-dev am: 79089488 am: 27c9c83f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20748232



Change-Id: I1aaf554a0f9b93b48e22b6f3cdfe88c493d87174
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e07c64a 27c9c83f

packages/SettingsLib/src/com/android/settingslib/Utils.java

+9 −1
Original line number Diff line number Diff line
@@ -308,8 +308,16 @@ public class Utils { 


    @ColorInt

    public static int getColorAttrDefaultColor(Context context, int attr) {

        return getColorAttrDefaultColor(context, attr, 0);

    }



    /**

     * Get color styled attribute {@code attr}, default to {@code defValue} if not found.

     */

    @ColorInt

    public static int getColorAttrDefaultColor(Context context, int attr, @ColorInt int defValue) {

        TypedArray ta = context.obtainStyledAttributes(new int[]{attr});

        @ColorInt int colorAccent = ta.getColor(0, 0);

        @ColorInt int colorAccent = ta.getColor(0, defValue);

        ta.recycle();

        return colorAccent;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

+5 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.widget.FrameLayout;



import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.collection.ArrayMap;
@@ -62,6 +63,8 @@ public class NotificationIconAreaController implements 


    public static final String HIGH_PRIORITY = "high_priority";

    private static final long AOD_ICONS_APPEAR_DURATION = 200;

    @ColorInt

    private static final int DEFAULT_AOD_ICON_COLOR = 0xffffffff;



    private final ContrastColorUtil mContrastColorUtil;

    private final Runnable mUpdateStatusBarIcons = this::updateStatusBarIcons;
@@ -84,7 +87,7 @@ public class NotificationIconAreaController implements 
    private NotificationIconContainer mShelfIcons;

    private NotificationIconContainer mAodIcons;

    private final ArrayList<Rect> mTintAreas = new ArrayList<>();

    private Context mContext;

    private final Context mContext;



    private final DemoModeController mDemoModeController;
@@ -567,7 +570,7 @@ public class NotificationIconAreaController implements 


    private void reloadAodColor() {

        mAodIconTint = Utils.getColorAttrDefaultColor(mContext,

                R.attr.wallpaperTextColor);

                R.attr.wallpaperTextColor, DEFAULT_AOD_ICON_COLOR);

    }



    private void updateAodIconColors() {