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

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

Merge "Merge "Interpolate corner to 0 when recording screen" into sc-dev am:... 

Merge "Merge "Interpolate corner to 0 when recording screen" into sc-dev am: e98202ed am: 8223a28b" into sc-v2-dev am: 9c1015d3

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

Change-Id: I2c81f15f1bf1970c26f0dc239dc63e04221e149a
parents b428a7bc 9c1015d3

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

+6 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import com.android.systemui.plugins.qs.QS; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.screenrecord.RecordingController;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;
@@ -335,6 +336,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    private final TapAgainViewController mTapAgainViewController;

    private final SplitShadeHeaderController mSplitShadeHeaderController;

    private final RecordingController mRecordingController;

    private boolean mShouldUseSplitNotificationShade;

    // Current max allowed keyguard notifications determined by measuring the panel

    private int mMaxAllowedKeyguardNotifications;
@@ -721,6 +723,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            FragmentService fragmentService,

            ContentResolver contentResolver,

            QuickAccessWalletController quickAccessWalletController,

            RecordingController recordingController,

            @Main Executor uiExecutor,

            SecureSettings secureSettings,

            SplitShadeHeaderController splitShadeHeaderController,
@@ -767,6 +770,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle());

        setPanelAlpha(255, false /* animate */);

        mCommandQueue = commandQueue;

        mRecordingController = recordingController;

        mDisplayId = displayId;

        mPulseExpansionHandler = pulseExpansionHandler;

        mDozeParameters = dozeParameters;
@@ -2414,7 +2418,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            // The padding on this area is large enough that we can use a cheaper clipping strategy

            mKeyguardStatusAreaClipBounds.set(left, top, right, bottom);

            clipStatusView = qsVisible;

            radius = (int) MathUtils.lerp(mScreenCornerRadius, mScrimCornerRadius,

            float screenCornerRadius = mRecordingController.isRecording() ? 0 : mScreenCornerRadius;

            radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius,

                    Math.min(top / (float) mScrimCornerRadius, 1f));

            statusBarClipTop = top - mKeyguardStatusBar.getTop();

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import com.android.systemui.media.MediaHierarchyManager; 
import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.screenrecord.RecordingController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.KeyguardAffordanceView;
@@ -300,6 +301,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
    private NotificationRemoteInputManager mNotificationRemoteInputManager;

    @Mock

    private RemoteInputController mRemoteInputController;

    @Mock

    private RecordingController mRecordingController;



    private SysuiStatusBarStateController mStatusBarStateController;

    private NotificationPanelViewController mNotificationPanelViewController;
@@ -438,6 +441,7 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
                mFragmentService,

                mContentResolver,

                mQuickAccessWalletController,

                mRecordingController,

                new FakeExecutor(new FakeSystemClock()),

                mSecureSettings,

                mSplitShadeHeaderController,