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

Commit a122bd8f authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Add flags to enable QS clipping / Scrim transparency." into tm-qpr-dev

parents 4b3a0012 5713d10f

packages/SystemUI/res/values/bools.xml

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ 
<resources>

    <!-- Whether to show the user switcher in quick settings when only a single user is present. -->

    <bool name="qs_show_user_switcher_for_single_user">false</bool>



    <!-- Whether to show a custom biometric prompt size-->

    <bool name="use_custom_bp_size">false</bool>



    <!-- Whether to enable clipping on Quick Settings -->

    <bool name="qs_enable_clipping">true</bool>



    <!-- Whether to enable transparent background for notification scrims -->

    <bool name="notification_scrim_transparent">false</bool>

</resources>

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+7 −2
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ public final class NotificationPanelViewController { 
    private int mScreenCornerRadius;

    private boolean mQSAnimatingHiddenFromCollapsed;

    private boolean mUseLargeScreenShadeHeader;

    private boolean mEnableQsClipping;



    private int mQsClipTop;

    private int mQsClipBottom;
@@ -1298,6 +1299,8 @@ public final class NotificationPanelViewController { 


        mSplitShadeFullTransitionDistance =

                mResources.getDimensionPixelSize(R.dimen.split_shade_full_transition_distance);



        mEnableQsClipping = mResources.getBoolean(R.bool.qs_enable_clipping);

    }



    private void onSplitShadeEnabledChanged() {
@@ -2952,8 +2955,10 @@ public final class NotificationPanelViewController { 
            mQsTranslationForFullShadeTransition = qsTranslation;

            updateQsFrameTranslation();

            float currentTranslation = mQsFrame.getTranslationY();

            mQsClipTop = (int) (top - currentTranslation - mQsFrame.getTop());

            mQsClipBottom = (int) (bottom - currentTranslation - mQsFrame.getTop());

            mQsClipTop = mEnableQsClipping

                    ? (int) (top - currentTranslation - mQsFrame.getTop()) : 0;

            mQsClipBottom = mEnableQsClipping

                    ? (int) (bottom - currentTranslation - mQsFrame.getTop()) : 0;

            mQsVisible = qsVisible;

            mQs.setQsVisible(mQsVisible);

            mQs.setFancyClipping(

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

+10 −4
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
    private Callback mCallback;

    private boolean mWallpaperSupportsAmbientMode;

    private boolean mScreenOn;

    private boolean mTransparentScrimBackground;



    // Scrim blanking callbacks

    private Runnable mPendingFrameCallback;
@@ -341,6 +342,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        mScrimBehind.setDefaultFocusHighlightEnabled(false);

        mNotificationsScrim.setDefaultFocusHighlightEnabled(false);

        mScrimInFront.setDefaultFocusHighlightEnabled(false);

        mTransparentScrimBackground = notificationsScrim.getResources()

                .getBoolean(R.bool.notification_scrim_transparent);

        updateScrims();

        mKeyguardUpdateMonitor.registerCallback(mKeyguardVisibilityCallback);

    }
@@ -777,13 +780,16 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
                float behindFraction = getInterpolatedFraction();

                behindFraction = (float) Math.pow(behindFraction, 0.8f);

                if (mClipsQsScrim) {

                    mBehindAlpha = 1;

                    mNotificationsAlpha = behindFraction * mDefaultScrimAlpha;

                    mBehindAlpha = mTransparentScrimBackground ? 0 : 1;

                    mNotificationsAlpha =

                            mTransparentScrimBackground ? 0 : behindFraction * mDefaultScrimAlpha;

                } else {

                    mBehindAlpha = behindFraction * mDefaultScrimAlpha;

                    mBehindAlpha =

                            mTransparentScrimBackground ? 0 : behindFraction * mDefaultScrimAlpha;

                    // Delay fade-in of notification scrim a bit further, to coincide with the

                    // view fade in. Otherwise the empty panel can be quite jarring.

                    mNotificationsAlpha = MathUtils.constrainedMap(0f, 1f, 0.3f, 0.75f,

                    mNotificationsAlpha = mTransparentScrimBackground

                            ? 0 : MathUtils.constrainedMap(0f, 1f, 0.3f, 0.75f,

                            mPanelExpansionFraction);

                }

                mBehindTint = mState.getBehindTint();