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

Commit 8f6eef09 authored by Felka Chang's avatar Felka Chang Committed by android-build-merger
Browse files

Merge "Fix notification shade inefficient contrast" into qt-dev 

am: f185b652

Change-Id: I88d04ee8a92d14d73cea35bedcac76441c58ce07
parents 1aa2934c f185b652

packages/SystemUI/res/values-night/colors.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,10 @@ 
    <color name="notification_divider_color">#212121</color>

    <color name="notification_divider_color">#212121</color>





    <!-- The background color of the notification shade -->

    <!-- The background color of the notification shade -->

    <color name="notification_shade_background_color">#181818</color>

    <color name="notification_shade_background_color">@color/GM2_grey_900</color>



    <!-- The color of the gear shown behind a notification -->

    <color name="notification_gear_color">@color/GM2_grey_500</color>





    <!-- The color of the ripples on the untinted notifications -->

    <!-- The color of the ripples on the untinted notifications -->

    <color name="notification_ripple_untinted_color">#30ffffff</color>

    <color name="notification_ripple_untinted_color">#30ffffff</color>

packages/SystemUI/res/values/colors.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ 
    <color name="notification_divider_color">#FF616161</color>

    <color name="notification_divider_color">#FF616161</color>





    <!-- The background color of the notification shade -->

    <!-- The background color of the notification shade -->

    <color name="notification_shade_background_color">#ffeeeeee</color>

    <color name="notification_shade_background_color">@color/GM2_grey_200</color>





    <!-- The color of the ripples on the untinted notifications -->

    <!-- The color of the ripples on the untinted notifications -->

    <color name="notification_ripple_untinted_color">#28000000</color>

    <color name="notification_ripple_untinted_color">#28000000</color>
@@ -83,7 +83,7 @@ 
    <color name="notification_ripple_tinted_color">#30ffffff</color>

    <color name="notification_ripple_tinted_color">#30ffffff</color>





    <!-- The color of the gear shown behind a notification -->

    <!-- The color of the gear shown behind a notification -->

    <color name="notification_gear_color">#ff757575</color>

    <color name="notification_gear_color">@color/GM2_grey_700</color>





    <!-- The color of the text inside a notification -->

    <!-- The color of the text inside a notification -->

    <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_light</color>

    <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_light</color>

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

+1 −8
Original line number Original line Diff line number Diff line
@@ -939,18 +939,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
            return;

            return;

        }

        }





        float alpha =

                BACKGROUND_ALPHA_DIMMED + (1 - BACKGROUND_ALPHA_DIMMED) * (1.0f - mDimAmount);

        alpha *= 1f - mInterpolatedDarkAmount;

        // We need to manually blend in the background color.

        int scrimColor = mScrimController.getBackgroundColor();

        int awakeColor = ColorUtils.blendARGB(scrimColor, mBgColor, alpha);



        // Interpolate between semi-transparent notification panel background color

        // Interpolate between semi-transparent notification panel background color

        // and white AOD separator.

        // and white AOD separator.

        float colorInterpolation = MathUtils.smoothStep(0.4f /* start */, 1f /* end */,

        float colorInterpolation = MathUtils.smoothStep(0.4f /* start */, 1f /* end */,

                mLinearDarkAmount);

                mLinearDarkAmount);

        int color = ColorUtils.blendARGB(awakeColor, Color.WHITE, colorInterpolation);

        int color = ColorUtils.blendARGB(mBgColor, Color.WHITE, colorInterpolation);





        if (mCachedBackgroundColor != color) {

        if (mCachedBackgroundColor != color) {

            mCachedBackgroundColor = color;

            mCachedBackgroundColor = color;