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

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

    <!-- 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 -->

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

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

    <!-- 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 -->

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

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

    <!-- 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 -->

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

            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

        // and white AOD separator.

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

                mLinearDarkAmount);

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

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

        if (mCachedBackgroundColor != color) {

            mCachedBackgroundColor = color;