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

Commit d369b905 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Remove blurs when adjusting brightness" into rvc-dev am: 137af5ad 

Change-Id: I80e61728a342b389508d022d34ff608238530a8d
parents a28daa00 137af5ad

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.android.systemui.statusbar.NavigationBarController; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;
@@ -225,6 +226,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            KeyguardIndicationController keyguardIndicationController,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            Lazy<NotificationShadeDepthController> depthControllerLazy,

            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {

        super(
@@ -304,6 +306,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                phoneStatusBarPolicy,

                keyguardIndicationController,

                dismissCallbackRegistry,

                depthControllerLazy,

                statusBarTouchableRegionManager);

        mUserSwitcherController = userSwitcherController;

        mScrimController = scrimController;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.statusbar.NavigationBarController; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;
@@ -200,6 +201,7 @@ public class CarStatusBarModule { 
            KeyguardIndicationController keyguardIndicationController,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,

            CarNavigationBarController carNavigationBarController) {

        return new CarStatusBar(

                context,
@@ -278,6 +280,7 @@ public class CarStatusBarModule { 
                keyguardIndicationController,

                dismissCallbackRegistry,

                statusBarTouchableRegionManager,

                notificationShadeDepthControllerLazy,

                carNavigationBarController);

    }

}

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

+20 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.systemui.statusbar.phone.PanelExpansionListener 
import com.android.systemui.statusbar.policy.KeyguardStateController

import java.io.FileDescriptor

import java.io.PrintWriter

import java.lang.IllegalArgumentException

import javax.inject.Inject

import javax.inject.Singleton

import kotlin.math.max
@@ -74,6 +73,15 @@ class NotificationShadeDepthController @Inject constructor( 
    @VisibleForTesting

    var globalActionsSpring = DepthAnimation()



    @VisibleForTesting

    var brightnessMirrorSpring = DepthAnimation()

    var brightnessMirrorVisible: Boolean = false

        set(value) {

            field = value

            brightnessMirrorSpring.animateTo(if (value) blurUtils.blurRadiusOfRatio(1f)

                else 0)

        }



    /**

     * Blur radius of the wake-up animation on this frame.

     */
@@ -91,7 +99,9 @@ class NotificationShadeDepthController @Inject constructor( 
    val updateBlurCallback = Choreographer.FrameCallback {

        updateScheduled = false



        val blur = max(max(shadeSpring.radius, wakeAndUnlockBlurRadius), globalActionsSpring.radius)

        var shadeRadius = max(shadeSpring.radius, wakeAndUnlockBlurRadius)

        shadeRadius = (shadeRadius * (1f - brightnessMirrorSpring.ratio)).toInt()

        val blur = max(shadeRadius, globalActionsSpring.radius)

        blurUtils.applyBlur(blurRoot?.viewRootImpl ?: root.viewRootImpl, blur)

        try {

            wallpaperManager.setWallpaperZoomOut(root.windowToken,
@@ -148,6 +158,7 @@ class NotificationShadeDepthController @Inject constructor( 
            if (isDozing) {

                shadeSpring.finishIfRunning()

                globalActionsSpring.finishIfRunning()

                brightnessMirrorSpring.finishIfRunning()

            }

        }

    }
@@ -199,6 +210,7 @@ class NotificationShadeDepthController @Inject constructor( 
            it.increaseIndent()

            it.println("shadeRadius: ${shadeSpring.radius}")

            it.println("globalActionsRadius: ${globalActionsSpring.radius}")

            it.println("brightnessMirrorRadius: ${brightnessMirrorSpring.radius}")

            it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")

        }

    }
@@ -212,7 +224,12 @@ class NotificationShadeDepthController @Inject constructor( 
         * Blur radius visible on the UI, in pixels.

         */

        var radius = 0

            private set



        /**

         * Depth ratio of the current blur radius.

         */

        val ratio

            get() = blurUtils.ratioOfBlurRadius(radius)



        /**

         * Radius that we're animating to.

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

+5 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager; 
import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationPresenter;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;
@@ -589,6 +590,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private ActivityLaunchAnimator mActivityLaunchAnimator;

    protected StatusBarNotificationPresenter mPresenter;

    private NotificationActivityStarter mNotificationActivityStarter;

    private Lazy<NotificationShadeDepthController> mNotificationShadeDepthControllerLazy;

    private final BubbleController mBubbleController;

    private final BubbleController.BubbleExpandListener mBubbleExpandListener;
@@ -679,6 +681,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            PhoneStatusBarPolicy phoneStatusBarPolicy,

            KeyguardIndicationController keyguardIndicationController,

            DismissCallbackRegistry dismissCallbackRegistry,

            Lazy<NotificationShadeDepthController> notificationShadeDepthControllerLazy,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager) {

        super(context);

        mNotificationsController = notificationsController;
@@ -735,6 +738,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mScreenPinningRequest = screenPinningRequest;

        mDozeScrimController = dozeScrimController;

        mBiometricUnlockControllerLazy = biometricUnlockControllerLazy;

        mNotificationShadeDepthControllerLazy = notificationShadeDepthControllerLazy;

        mVolumeComponent = volumeComponent;

        mCommandQueue = commandQueue;

        mRecentsOptional = recentsOptional;
@@ -1135,6 +1139,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            mBrightnessMirrorController = new BrightnessMirrorController(

                    mNotificationShadeWindowView,

                    mNotificationPanelViewController,

                    mNotificationShadeDepthControllerLazy.get(),

                    (visible) -> {

                        mBrightnessMirrorVisible = visible;

                        updateScrimController();

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.statusbar.NavigationBarController; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SuperStatusBarViewFactory;
@@ -197,6 +198,7 @@ public interface StatusBarPhoneModule { 
            UserInfoControllerImpl userInfoControllerImpl,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            KeyguardIndicationController keyguardIndicationController,

            Lazy<NotificationShadeDepthController> notificationShadeDepthController,

            DismissCallbackRegistry dismissCallbackRegistry,

            StatusBarTouchableRegionManager statusBarTouchableRegionManager) {

        return new StatusBar(
@@ -276,6 +278,7 @@ public interface StatusBarPhoneModule { 
                phoneStatusBarPolicy,

                keyguardIndicationController,

                dismissCallbackRegistry,

                notificationShadeDepthController,

                statusBarTouchableRegionManager);

    }

}