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

Commit 45a0102b authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Revert "Remove more calls to addFullExpansionListener" 

Revert submission 24891808-addFullExpansionListener

Reason for revert: Potential culprit for b/305275185 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:24891808-addFullExpansionListener

Change-Id: I08641d935be797f91939376fea794b604e1626bc
parent b196e1b7

packages/SystemUI/src/com/android/systemui/shade/ShadeExpansionStateManager.kt

+9 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ class ShadeExpansionStateManager @Inject constructor() : ShadeStateEvents { 
        listener.onShadeExpansionFullyChanged(qsExpanded)

    }



    fun removeFullExpansionListener(listener: ShadeFullExpansionListener) {

        fullExpansionListeners.remove(listener)

    }



    fun addQsExpansionListener(listener: ShadeQsExpansionListener) {

        qsExpansionListeners.add(listener)

        listener.onQsExpansionChanged(qsExpanded)
@@ -95,6 +99,11 @@ class ShadeExpansionStateManager @Inject constructor() : ShadeStateEvents { 
        stateListeners.add(listener)

    }



    /** Removes a state listener. */

    fun removeStateListener(listener: ShadeStateListener) {

        stateListeners.remove(listener)

    }



    override fun addShadeStateEventsListener(listener: ShadeStateEventsListener) {

        shadeStateEventsListeners.addIfAbsent(listener)

    }

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt

+8 −9
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.statusbar.notification.stack.domain.interactor.Share 
import com.android.systemui.statusbar.phone.DozeParameters

import com.android.systemui.statusbar.pipeline.mobile.data.repository.UserSetupRepository

import com.android.systemui.statusbar.policy.data.repository.DeviceProvisioningRepository

import com.android.systemui.user.data.repository.UserRepository

import com.android.systemui.user.domain.interactor.UserInteractor

import com.android.systemui.util.kotlin.pairwise

import javax.inject.Inject

import javax.inject.Provider
@@ -71,7 +71,7 @@ constructor( 
    keyguardTransitionInteractor: KeyguardTransitionInteractor,

    powerInteractor: PowerInteractor,

    userSetupRepository: UserSetupRepository,

    userRepository: UserRepository,

    userInteractor: UserInteractor,

    sharedNotificationContainerInteractor: SharedNotificationContainerInteractor,

    repository: ShadeRepository,

) {
@@ -156,13 +156,12 @@ constructor( 
     *

     * TODO(b/300258424) remove all but the first sentence of this comment

     */

    val isAnyExpanded: StateFlow<Boolean> =

    val isAnyExpanded: Flow<Boolean> =

        if (sceneContainerFlags.isEnabled()) {

            anyExpansion.map { it > 0f }.distinctUntilChanged()

        } else {

            repository.legacyExpandedOrAwaitingInputTransfer

        }

            .stateIn(scope, SharingStarted.Eagerly, false)



    /**

     * Whether the user is expanding or collapsing the shade with user input. This will be true even
@@ -228,7 +227,7 @@ constructor( 
            isDeviceProvisioned &&

                // Disallow QS during setup if it's a simple user switcher. (The user intends to

                // use the lock screen user switcher, QS is not needed.)

                (isUserSetup || !userRepository.isSimpleUserSwitcher()) &&

                (isUserSetup || !userInteractor.isSimpleUserSwitcher) &&

                isShadeEnabled &&

                disableFlags.isQuickSettingsEnabled() &&

                !isDozing

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+7 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar; 


import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_TRANSITION_FROM_AOD;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_TRANSITION_TO_AOD;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -44,17 +43,15 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.keyguard.KeyguardClockSwitch;

import com.android.systemui.DejankUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.res.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

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

import com.android.systemui.res.R;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.shade.ShadeExpansionStateManager;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

import com.android.systemui.statusbar.policy.CallbackController;

import com.android.systemui.util.Compile;



import dagger.Lazy;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Comparator;
@@ -98,7 +95,6 @@ public class StatusBarStateControllerImpl implements 
    private final ArrayList<RankedListener> mListeners = new ArrayList<>();

    private final UiEventLogger mUiEventLogger;

    private final InteractionJankMonitor mInteractionJankMonitor;

    private final Lazy<ShadeInteractor> mShadeInteractorLazy;

    private int mState;

    private int mLastState;

    private int mUpcomingState;
@@ -162,13 +158,15 @@ public class StatusBarStateControllerImpl implements 
            UiEventLogger uiEventLogger,

            DumpManager dumpManager,

            InteractionJankMonitor interactionJankMonitor,

            Lazy<ShadeInteractor> shadeInteractorLazy) {

            ShadeExpansionStateManager shadeExpansionStateManager

    ) {

        mUiEventLogger = uiEventLogger;

        mInteractionJankMonitor = interactionJankMonitor;

        mShadeInteractorLazy = shadeInteractorLazy;

        for (int i = 0; i < HISTORY_SIZE; i++) {

            mHistoricalRecords[i] = new HistoricalState();

        }

        shadeExpansionStateManager.addFullExpansionListener(this::onShadeExpansionFullyChanged);



        dumpManager.registerDumpable(this);

    }
@@ -338,8 +336,6 @@ public class StatusBarStateControllerImpl implements 
                && (view != null && view.isAttachedToWindow())) {

            mView = view;

            mClockSwitchView = view.findViewById(R.id.keyguard_clock_container);

            collectFlow(mView, mShadeInteractorLazy.get().isAnyExpanded(),

                    this::onShadeOrQsExpanded);

        }

        mDozeAmountTarget = dozeAmount;

        if (animated) {
@@ -349,7 +345,7 @@ public class StatusBarStateControllerImpl implements 
        }

    }



    private void onShadeOrQsExpanded(Boolean isExpanded) {

    private void onShadeExpansionFullyChanged(Boolean isExpanded) {

        if (mIsExpanded != isExpanded) {

            mIsExpanded = isExpanded;

            String tag = getClass().getSimpleName() + "#setIsExpanded";

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java

+0 −5
Original line number Diff line number Diff line
@@ -180,9 +180,4 @@ public interface NotificationInterruptStateProvider { 
     * Add a component that can suppress visual interruptions.

     */

    void addSuppressor(NotificationInterruptSuppressor suppressor);



    /**

     * Remove a component that can suppress visual interruptions.

     */

    void removeSuppressor(NotificationInterruptSuppressor suppressor);

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -174,11 +174,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter 
        mSuppressors.add(suppressor);

    }



    @Override

    public void removeSuppressor(NotificationInterruptSuppressor suppressor) {

        mSuppressors.remove(suppressor);

    }



    @Override

    public boolean shouldBubbleUp(NotificationEntry entry) {

        final StatusBarNotification sbn = entry.getSbn();