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

Commit 691a5d9f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make QS pull down consistent with shade" into sc-v2-dev am: c94c3639 am: 89a2bfad 

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

Change-Id: I8dc531ae0a5a67df2dd96a41c98760088ea45f6d
parents f27bff0b 89a2bfad

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt

+2 −1
Original line number Diff line number Diff line
@@ -181,7 +181,8 @@ class NotificationShadeDepthController @Inject constructor( 
                        if (shouldApplyShadeBlur()) shadeExpansion else 0f, false))

        var combinedBlur = (expansionRadius * INTERACTION_BLUR_FRACTION +

                animationRadius * ANIMATION_BLUR_FRACTION)

        val qsExpandedRatio = qsPanelExpansion * shadeExpansion

        val qsExpandedRatio = Interpolators.getNotificationScrimAlpha(qsPanelExpansion,

                false /* notification */) * shadeExpansion

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(qsExpandedRatio))

        combinedBlur = max(combinedBlur, blurUtils.blurRadiusOfRatio(transitionToFullShadeProgress))

        var shadeRadius = max(combinedBlur, wakeAndUnlockBlurRadius)

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

+2 −0
Original line number Diff line number Diff line
@@ -556,6 +556,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        if (isNaN(expansionFraction)) {

            return;

        }

        expansionFraction = Interpolators

                .getNotificationScrimAlpha(expansionFraction, false /* notification */);

        boolean qsBottomVisible = qsPanelBottomY > 0;

        if (mQsExpansion != expansionFraction || mQsBottomVisible != qsBottomVisible) {

            mQsExpansion = expansionFraction;

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt

+14 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.View 
import android.view.ViewRootImpl

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.animation.Interpolators

import com.android.systemui.dump.DumpManager

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.phone.BiometricUnlockController
@@ -178,10 +179,21 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { 


    @Test

    fun setQsPanelExpansion_appliesBlur() {

        statusBarState = StatusBarState.KEYGUARD

        notificationShadeDepthController.qsPanelExpansion = 1f

        notificationShadeDepthController.onPanelExpansionChanged(0.5f, tracking = false)

        notificationShadeDepthController.onPanelExpansionChanged(1f, tracking = false)

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

        verify(blurUtils).applyBlur(any(), anyInt(), eq(false))

        verify(blurUtils).applyBlur(any(), eq(maxBlur), eq(false))

    }



    @Test

    fun setQsPanelExpansion_easing() {

        statusBarState = StatusBarState.KEYGUARD

        notificationShadeDepthController.qsPanelExpansion = 0.25f

        notificationShadeDepthController.onPanelExpansionChanged(1f, tracking = false)

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

        verify(wallpaperManager).setWallpaperZoomOut(any(),

                eq(Interpolators.getNotificationScrimAlpha(0.25f, false /* notifications */)))

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
    public void qsExpansion_half_clippingQs() {

        reset(mScrimBehind);

        mScrimController.setClipsQsScrim(true);

        mScrimController.setQsPosition(0.5f, 999 /* value doesn't matter */);

        mScrimController.setQsPosition(0.25f, 999 /* value doesn't matter */);

        finishAnimationsImmediately();



        assertScrimAlpha(Map.of(
@@ -1138,7 +1138,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
    @Test

    public void testScrimsVisible_whenShadeVisibleOnLockscreen() {

        mScrimController.transitionTo(ScrimState.KEYGUARD);

        mScrimController.setQsPosition(0.5f, 300);

        mScrimController.setQsPosition(0.25f, 300);



        assertScrimAlpha(Map.of(

                mScrimBehind, SEMI_TRANSPARENT,