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

Commit 6465603d authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes from topic "caitlinshk-csi-updateQsExpansion" into udc-qpr-dev... 

Merge changes from topic "caitlinshk-csi-updateQsExpansion" into udc-qpr-dev am: 2e6eaf0a am: 3898e5f3

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



Change-Id: Ie1b227799f2eed021521579d70e45752e2fad361
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2115dc3c 3898e5f3

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.connectivity.ConnectivityModule;

import com.android.systemui.statusbar.disableflags.dagger.DisableFlagsModule;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -166,6 +167,7 @@ import javax.inject.Named; 
            DreamModule.class,

            ControlsModule.class,

            DemoModeModule.class,

            DisableFlagsModule.class,

            FalsingModule.class,

            FlagsModule.class,

            SystemPropertiesFlagsModule.class,

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                new NsslHeightChangedListener());

        mNotificationStackScrollLayoutController.setOnEmptySpaceClickListener(

                mOnEmptySpaceClickListener);

        mQsController.initNotificationStackScrollLayoutController();

        mQsController.init();

        mShadeExpansionStateManager.addQsExpansionListener(this::onQsExpansionChanged);

        mShadeHeadsUpTracker.addTrackingHeadsUpListener(

                mNotificationStackScrollLayoutController::setTrackingHeadsUp);

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+16 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.qs.QS;

import com.android.systemui.screenrecord.RecordingController;

import com.android.systemui.shade.data.repository.ShadeRepository;

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

import com.android.systemui.shade.transition.ShadeTransitionController;

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

import com.android.systemui.statusbar.LockscreenShadeTransitionController;
@@ -101,6 +102,7 @@ import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent; 
import com.android.systemui.statusbar.policy.CastController;

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

import com.android.systemui.util.LargeScreenUtils;

import com.android.systemui.util.kotlin.JavaAdapter;



import dagger.Lazy;
@@ -153,6 +155,8 @@ public class QuickSettingsController implements Dumpable { 
    private final FeatureFlags mFeatureFlags;

    private final InteractionJankMonitor mInteractionJankMonitor;

    private final ShadeRepository mShadeRepository;

    private final ShadeInteractor mShadeInteractor;

    private final JavaAdapter mJavaAdapter;

    private final FalsingManager mFalsingManager;

    private final AccessibilityManager mAccessibilityManager;

    private final MetricsLogger mMetricsLogger;
@@ -342,6 +346,8 @@ public class QuickSettingsController implements Dumpable { 
            DumpManager dumpManager,

            KeyguardFaceAuthInteractor keyguardFaceAuthInteractor,

            ShadeRepository shadeRepository,

            ShadeInteractor shadeInteractor,

            JavaAdapter javaAdapter,

            CastController castController

    ) {

        mPanelViewControllerLazy = panelViewControllerLazy;
@@ -387,6 +393,8 @@ public class QuickSettingsController implements Dumpable { 
        mFeatureFlags = featureFlags;

        mInteractionJankMonitor = interactionJankMonitor;

        mShadeRepository = shadeRepository;

        mShadeInteractor = shadeInteractor;

        mJavaAdapter = javaAdapter;



        mLockscreenShadeTransitionController.addCallback(new LockscreenShadeTransitionCallback());

        dumpManager.registerDumpable(this);
@@ -459,7 +467,13 @@ public class QuickSettingsController implements Dumpable { 
    }



    // TODO (b/265054088): move this and others to a CoreStartable

    void initNotificationStackScrollLayoutController() {

    void init() {

        initNotificationStackScrollLayoutController();

        mJavaAdapter.alwaysCollectFlow(

                mShadeInteractor.isExpandToQsEnabled(), this::setExpansionEnabledPolicy);

    }



    private void initNotificationStackScrollLayoutController() {

        mNotificationStackScrollLayoutController.setOverscrollTopChangedListener(

                new NsslOverscrollTopChangedListener());

        mNotificationStackScrollLayoutController.setOnStackYChanged(this::onStackYChanged);
@@ -883,7 +897,7 @@ public class QuickSettingsController implements Dumpable { 
    }



    /** */

    public void setExpansionEnabledPolicy(boolean expansionEnabledPolicy) {

    private void setExpansionEnabledPolicy(boolean expansionEnabledPolicy) {

        mExpansionEnabledPolicy = expansionEnabledPolicy;

        if (mQs != null) {

            mQs.setHeaderClickable(isExpansionEnabled());

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

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.systemui.shade.domain.interactor



import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.data.repository.KeyguardRepository

import com.android.systemui.statusbar.disableflags.data.repository.DisableFlagsRepository

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController

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

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.combine



/** Business logic for shade interactions. */

@SysUISingleton

class ShadeInteractor

@Inject

constructor(

    disableFlagsRepository: DisableFlagsRepository,

    keyguardRepository: KeyguardRepository,

    userSetupRepository: UserSetupRepository,

    deviceProvisionedController: DeviceProvisionedController,

    userInteractor: UserInteractor,

) {

    /** Emits true if the shade can be expanded from QQS to QS and false otherwise. */

    val isExpandToQsEnabled: Flow<Boolean> =

        combine(

            disableFlagsRepository.disableFlags,

            keyguardRepository.isDozing,

            userSetupRepository.isUserSetupFlow,

        ) { disableFlags, isDozing, isUserSetup ->

            deviceProvisionedController.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 || !userInteractor.isSimpleUserSwitcher) &&

                disableFlags.isShadeEnabled() &&

                disableFlags.isQuickSettingsEnabled() &&

                !isDozing

        }

}

packages/SystemUI/src/com/android/systemui/statusbar/disableflags/dagger/DisableFlagsModule.kt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.disableflags.dagger



import com.android.systemui.statusbar.disableflags.data.repository.DisableFlagsRepository

import com.android.systemui.statusbar.disableflags.data.repository.DisableFlagsRepositoryImpl

import dagger.Binds

import dagger.Module



/** Provides information related to disable flags. */

@Module

abstract class DisableFlagsModule {

    @Binds

    abstract fun bindDisableFlagsRepo(impl: DisableFlagsRepositoryImpl): DisableFlagsRepository

}