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

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

Merge "Make foreground color selection in SmartReplyView and RemoteInputView... 

Merge "Make foreground color selection in SmartReplyView and RemoteInputView match Notification." into sc-qpr1-dev am: 0c43fe4e am: e5a0d109

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

Change-Id: Ia0d1b02f462804844dc0198cef993153583160af
parents 23597d34 e5a0d109

core/java/android/app/Notification.java

+2 −1
Original line number Diff line number Diff line
@@ -6247,8 +6247,9 @@ public class Notification implements Parcelable 
         *

         * @param color the color to check

         * @return true if the color has higher contrast with white than black

         * @hide

         */

        private static boolean isColorDark(int color) {

        public static boolean isColorDark(int color) {

            // as per ContrastColorUtil.shouldUseDark, this uses the color contrast midpoint.

            return ContrastColorUtil.calculateLuminance(color) <= 0.17912878474;

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+1 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.util.ContrastColorUtil;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -204,7 +203,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
        final int stroke = colorized ? mContext.getResources().getDimensionPixelSize(

                R.dimen.remote_input_view_text_stroke) : 0;

        if (colorized) {

            final boolean dark = !ContrastColorUtil.isColorLight(backgroundColor);

            final boolean dark = Notification.Builder.isColorDark(backgroundColor);

            final int foregroundColor = dark ? Color.WHITE : Color.BLACK;

            final int inverseColor = dark ? Color.BLACK : Color.WHITE;

            editBgColor = backgroundColor;

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ public class SmartReplyView extends ViewGroup { 
        mCurrentBackgroundColor = backgroundColor;

        mCurrentColorized = colorized;



        final boolean dark = !ContrastColorUtil.isColorLight(backgroundColor);

        final boolean dark = Notification.Builder.isColorDark(backgroundColor);



        mCurrentTextColor = ContrastColorUtil.ensureTextContrast(

                dark ? mDefaultTextColorDarkBg : mDefaultTextColor,