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

Commit 26945ff5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AOD/LS - Hide large clock with media"

parents 4e4da188 d0705a3e

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

+7 −2
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.doze.DozeLog;

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.fragments.FragmentHostManager.FragmentListener;

import com.android.systemui.media.MediaDataManager;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QS;
@@ -454,6 +455,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private final CommandQueue mCommandQueue;

    private final NotificationLockscreenUserManager mLockscreenUserManager;

    private final ShadeController mShadeController;

    private final MediaDataManager mMediaDataManager;

    private int mDisplayId;



    /**
@@ -545,7 +547,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            NotificationGroupManagerLegacy groupManager,

            NotificationIconAreaController notificationIconAreaController,

            AuthController authController,

            QSDetailDisplayer qsDetailDisplayer) {

            QSDetailDisplayer qsDetailDisplayer,

            MediaDataManager mediaDataManager) {

        super(view, falsingManager, dozeLog, keyguardStateController,

                (SysuiStatusBarStateController) statusBarStateController, vibratorHelper,

                latencyTracker, flingAnimationUtilsBuilder, statusBarTouchableRegionManager);
@@ -575,6 +578,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        mPulseExpansionHandler = pulseExpansionHandler;

        mDozeParameters = dozeParameters;

        mBiometricUnlockController = biometricUnlockController;

        mMediaDataManager = mediaDataManager;

        pulseExpansionHandler.setPulseExpandAbortListener(() -> {

            if (mQs != null) {

                mQs.animateHeaderSlidingOut();
@@ -890,7 +894,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            int clockPreferredY = mKeyguardStatusViewController.getClockPreferredY(totalHeight);

            boolean bypassEnabled = mKeyguardBypassController.getBypassEnabled();

            final boolean hasVisibleNotifications = !bypassEnabled

                    && mNotificationStackScrollLayoutController.getVisibleNotificationCount() != 0;

                    && (mNotificationStackScrollLayoutController.getVisibleNotificationCount() != 0

                    || mMediaDataManager.hasActiveMedia());

            mKeyguardStatusViewController.setHasVisibleNotifications(hasVisibleNotifications);

            mClockPositionAlgorithm.setup(mStatusBarMinHeight, totalHeight - bottomPadding,

                    mNotificationStackScrollLayoutController.getIntrinsicContentHeight(),

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

+5 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.systemui.biometrics.AuthController; 
import com.android.systemui.classifier.FalsingCollectorFake;

import com.android.systemui.classifier.FalsingManagerFake;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.media.MediaDataManager;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.CommandQueue;
@@ -197,6 +198,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
    private NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    @Mock

    private AuthController mAuthController;

    @Mock

    private MediaDataManager mMediaDataManager;



    private NotificationPanelViewController mNotificationPanelViewController;

    private View.AccessibilityDelegate mAccessibiltyDelegate;
@@ -275,7 +278,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
                mGroupManager,

                mNotificationAreaController,

                mAuthController,

                new QSDetailDisplayer());

                new QSDetailDisplayer(),

                mMediaDataManager);

        mNotificationPanelViewController.initDependencies(

                mStatusBar,

                mNotificationShelfController);