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

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

Merge "Fix status bar flickering" into rvc-dev am: e22637f3 

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

Change-Id: I9565e51d9843b91d1fbb251ae586408e2e21626d
parents 2f1ee037 e22637f3

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

+5 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private final ConfigurationListener mConfigurationListener = new ConfigurationListener();

    private final StatusBarStateListener mStatusBarStateListener = new StatusBarStateListener();

    private final ExpansionCallback mExpansionCallback = new ExpansionCallback();

    private final BiometricUnlockController mBiometricUnlockController;

    private final NotificationPanelView mView;

    private final MetricsLogger mMetricsLogger;

    private final ActivityManager mActivityManager;
@@ -227,7 +228,8 @@ public class NotificationPanelViewController extends PanelViewController { 
                            mBarState == StatusBarState.KEYGUARD

                                    || mBarState == StatusBarState.SHADE_LOCKED;

                    if (!running && mFirstBypassAttempt && keyguardOrShadeLocked && !mDozing

                            && !mDelayShowingKeyguardStatusBar) {

                            && !mDelayShowingKeyguardStatusBar

                            && !mBiometricUnlockController.isBiometricUnlock()) {

                        mFirstBypassAttempt = false;

                        animateKeyguardStatusBarIn(StackStateAnimator.ANIMATION_DURATION_STANDARD);

                    }
@@ -487,6 +489,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            StatusBarTouchableRegionManager statusBarTouchableRegionManager,

            ConversationNotificationManager conversationNotificationManager,

            MediaHierarchyManager mediaHierarchyManager,

            BiometricUnlockController biometricUnlockController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager) {

        super(view, falsingManager, dozeLog, keyguardStateController,

                (SysuiStatusBarStateController) statusBarStateController, vibratorHelper,
@@ -511,6 +514,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        mDisplayId = displayId;

        mPulseExpansionHandler = pulseExpansionHandler;

        mDozeParameters = dozeParameters;

        mBiometricUnlockController = biometricUnlockController;

        pulseExpansionHandler.setPulseExpandAbortListener(() -> {

            if (mQs != null) {

                mQs.animateHeaderSlidingOut();

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

+3 −1
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
    @Mock

    private ConversationNotificationManager mConversationNotificationManager;

    @Mock

    private BiometricUnlockController mBiometricUnlockController;

    @Mock

    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private FlingAnimationUtils.Builder mFlingAnimationUtilsBuilder;
@@ -238,7 +240,7 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
                mMetricsLogger, mActivityManager, mZenModeController, mConfigurationController,

                mFlingAnimationUtilsBuilder, mStatusBarTouchableRegionManager,

                mConversationNotificationManager, mMediaHiearchyManager,

                mStatusBarKeyguardViewManager);

                mBiometricUnlockController, mStatusBarKeyguardViewManager);

        mNotificationPanelViewController.initDependencies(mStatusBar, mGroupManager,

                mNotificationShelf, mNotificationAreaController, mScrimController);

        mNotificationPanelViewController.setHeadsUpManager(mHeadsUpManager);