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

Commit 68499c8e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Change scrim on lockscreen and transparency of cards a bit." into master-lockscreen-dev

parents dba78006 e46f5211

core/res/res/drawable/notification_quantum_bg_dim.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ 
<touch-feedback

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="#ffffffff"

    android:tintMode="src_over"

    >

    <item>

        <shape>

            <solid android:color="#f0d0d0d0" />

            <solid android:color="#d4ffffff" />

            <corners android:radius="@dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

packages/SystemUI/res/values/colors.xml

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
    <drawable name="notification_item_background_legacy_color">#ffaaaaaa</drawable>

    <drawable name="heads_up_notification_bg_pressed">#ff33B5E5</drawable>

    <drawable name="notification_header_bg">#FF000000</drawable>

    <color name="notification_panel_scrim_color">#B0000000</color>

    <color name="notification_panel_scrim_color">#A0000000</color>

    <color name="notification_panel_scrim_color_keyguard">#80000000</color>

    <color name="batterymeter_frame_color">#66FFFFFF</color><!-- 40% white -->

    <color name="batterymeter_charge_color">#FFFFFFFF</color>

    <color name="batterymeter_bolt_color">#FFFFFFFF</color>

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

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class PhoneStatusBarView extends PanelBar { 


    PhoneStatusBar mBar;

    int mScrimColor;

    int mScrimColorKeyguard;

    float mSettingsPanelDragzoneFrac;

    float mSettingsPanelDragzoneMin;
@@ -52,6 +53,7 @@ public class PhoneStatusBarView extends PanelBar { 


        Resources res = getContext().getResources();

        mScrimColor = res.getColor(R.color.notification_panel_scrim_color);

        mScrimColorKeyguard = res.getColor(R.color.notification_panel_scrim_color_keyguard);

        mSettingsPanelDragzoneMin = res.getDimension(R.dimen.settings_panel_dragzone_min);

        try {

            mSettingsPanelDragzoneFrac = res.getFraction(R.dimen.settings_panel_dragzone_fraction, 1, 1);
@@ -217,6 +219,7 @@ public class PhoneStatusBarView extends PanelBar { 
        if (panel == mFadingPanel && mScrimColor != 0 && ActivityManager.isHighEndGfx()

                && mBar.mStatusBarWindow != null) {

            if (mShouldFade) {

                int scrimColor = mBar.isOnKeyguard() ? mScrimColorKeyguard : mScrimColor;

                frac = mPanelExpandedFractionSum; // don't judge me

                // let's start this 20% of the way down the screen

                frac = frac * 1.2f - 0.2f;
@@ -226,7 +229,7 @@ public class PhoneStatusBarView extends PanelBar { 
                    // woo, special effects

                    final float k = (float)(1f-0.5f*(1f-Math.cos(3.14159f * Math.pow(1f-frac, 2f))));

                    // attenuate background color alpha by k

                    final int color = (int) ((mScrimColor >>> 24) * k) << 24 | (mScrimColor & 0xFFFFFF);

                    final int color = (int) ((scrimColor >>> 24) * k) << 24 | (scrimColor & 0xFFFFFF);

                    mBar.mStatusBarWindow.setBackgroundColor(color);

                }

            }