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

Commit 0dacd971 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Ensure QuickSettingsControllerImpl is off when scenes are on" into main

parents c8765124 f9347af4

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

+2 −2
Original line number Diff line number Diff line
@@ -96,12 +96,12 @@ import com.android.internal.policy.SystemBarUtils; 
import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.LatencyTracker;

import com.android.keyguard.ActiveUnlockConfig;

import com.android.keyguard.LockIconViewController;

import com.android.keyguard.KeyguardClockSwitch.ClockSize;

import com.android.keyguard.KeyguardStatusView;

import com.android.keyguard.KeyguardStatusViewController;

import com.android.keyguard.KeyguardUnfoldTransition;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.LockIconViewController;

import com.android.keyguard.dagger.KeyguardQsUserSwitchComponent;

import com.android.keyguard.dagger.KeyguardStatusBarViewComponent;

import com.android.keyguard.dagger.KeyguardStatusViewComponent;
@@ -772,6 +772,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            PowerInteractor powerInteractor,

            KeyguardClockPositionAlgorithm keyguardClockPositionAlgorithm,

            NaturalScrollingSettingObserver naturalScrollingSettingObserver) {

        SceneContainerFlag.assertInLegacyMode();

        keyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            public void onKeyguardFadingAwayChanged() {
@@ -982,7 +983,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
                });

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        dumpManager.registerDumpable(this);

        SceneContainerFlag.assertInLegacyMode();

    }



    private void unlockAnimationFinished() {

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

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
            SplitShadeStateController splitShadeStateController,

            Lazy<LargeScreenHeaderHelper> largeScreenHeaderHelperLazy

    ) {

        SceneContainerFlag.assertInLegacyMode();

        mPanelViewControllerLazy = panelViewControllerLazy;

        mPanelView = panelView;

        mLargeScreenHeaderHelperLazy = largeScreenHeaderHelperLazy;

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

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ interface ShadeViewController { 
    fun setQsScrimEnabled(qsScrimEnabled: Boolean)



    /** Sets the top spacing for the ambient indicator. */

    @Deprecated("Does nothing when scene container is enabled.")

    fun setAmbientIndicationTop(ambientIndicationTop: Int, ambientTextVisible: Boolean)



    /** Updates notification panel-specific flags on [SysUiState]. */
@@ -71,6 +72,7 @@ interface ShadeViewController { 
     */

    fun handleExternalTouch(event: MotionEvent): Boolean



    /** Sends an external (e.g. Status Bar) intercept touch event to the Shade touch handler. */

    fun handleExternalInterceptTouch(event: MotionEvent): Boolean



    /**