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

Commit 74dbdc4a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "Revert "[CS] Make NPVC and QuickSettingsController singletons."" into... 

Merge "Revert "[CS] Make NPVC and QuickSettingsController singletons."" into udc-qpr-dev am: ca7fbaac am: 0efbb3be

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



Change-Id: I148c3bd05486a92f154d419bed78a7acacfcf4d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62010d5e 0efbb3be

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ constructor( 
        // At startup, 2 views with the ID `R.id.keyguard_indication_area` will be available.

        // At startup, 2 views with the ID `R.id.keyguard_indication_area` will be available.

        // Disable one of them

        // Disable one of them

        if (featureFlags.isEnabled(Flags.MIGRATE_INDICATION_AREA)) {

        if (featureFlags.isEnabled(Flags.MIGRATE_INDICATION_AREA)) {

            legacyParent.findViewById<View>(R.id.keyguard_indication_area)?.let {

            legacyParent.requireViewById<View>(R.id.keyguard_indication_area).let {

                legacyParent.removeView(it)

                legacyParent.removeView(it)

            }

            }

        } else {

        } else {

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

+23 −14
Original line number Original line Diff line number Diff line
@@ -117,7 +117,6 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor 
import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants;

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants;

import com.android.systemui.classifier.Classifier;

import com.android.systemui.classifier.Classifier;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.DisplayId;

import com.android.systemui.dagger.qualifiers.DisplayId;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.doze.DozeLog;
@@ -209,6 +208,7 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; 
import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

import com.android.systemui.statusbar.phone.TapAgainViewController;

import com.android.systemui.statusbar.phone.TapAgainViewController;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

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

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

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

import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController;
@@ -238,7 +238,7 @@ import kotlin.Unit; 




import kotlinx.coroutines.CoroutineDispatcher;

import kotlinx.coroutines.CoroutineDispatcher;





@SysUISingleton

@CentralSurfacesComponent.CentralSurfacesScope

public final class NotificationPanelViewController implements ShadeSurface, Dumpable {

public final class NotificationPanelViewController implements ShadeSurface, Dumpable {





    public static final String TAG = NotificationPanelView.class.getSimpleName();

    public static final String TAG = NotificationPanelView.class.getSimpleName();
@@ -1407,13 +1407,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mKeyguardBottomArea = keyguardBottomArea;

        mKeyguardBottomArea = keyguardBottomArea;

    }

    }





    @Override

    void setOpenCloseListener(OpenCloseListener openCloseListener) {

    public void setOpenCloseListener(OpenCloseListener openCloseListener) {

        mOpenCloseListener = openCloseListener;

        mOpenCloseListener = openCloseListener;

    }

    }





    @Override

    void setTrackingStartedListener(TrackingStartedListener trackingStartedListener) {

    public void setTrackingStartedListener(TrackingStartedListener trackingStartedListener) {

        mTrackingStartedListener = trackingStartedListener;

        mTrackingStartedListener = trackingStartedListener;

    }

    }
@@ -3380,13 +3378,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        ViewGroupFadeHelper.reset(mView);

        ViewGroupFadeHelper.reset(mView);

    }

    }





    @Override

    void addOnGlobalLayoutListener(ViewTreeObserver.OnGlobalLayoutListener listener) {

    public void addOnGlobalLayoutListener(ViewTreeObserver.OnGlobalLayoutListener listener) {

        mView.getViewTreeObserver().addOnGlobalLayoutListener(listener);

        mView.getViewTreeObserver().addOnGlobalLayoutListener(listener);

    }

    }





    @Override

    void removeOnGlobalLayoutListener(ViewTreeObserver.OnGlobalLayoutListener listener) {

    public void removeOnGlobalLayoutListener(ViewTreeObserver.OnGlobalLayoutListener listener) {

        mView.getViewTreeObserver().removeOnGlobalLayoutListener(listener);

        mView.getViewTreeObserver().removeOnGlobalLayoutListener(listener);

    }

    }
@@ -3856,8 +3852,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return !isFullyCollapsed() && !mTracking && !mClosing;

        return !isFullyCollapsed() && !mTracking && !mClosing;

    }

    }





    @Override

    /** Collapses the shade instantly without animation. */

    public void instantCollapse() {

    void instantCollapse() {

        abortAnimations();

        abortAnimations();

        setExpandedFraction(0f);

        setExpandedFraction(0f);

        if (mExpanding) {

        if (mExpanding) {
@@ -4030,8 +4026,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mFixedDuration = NO_FIXED_DURATION;

        mFixedDuration = NO_FIXED_DURATION;

    }

    }





    @Override

    /** */

    public boolean postToView(Runnable action) {

    boolean postToView(Runnable action) {

        return mView.post(action);

        return mView.post(action);

    }

    }
@@ -5126,5 +5122,18 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            return super.performAccessibilityAction(host, action, args);

            return super.performAccessibilityAction(host, action, args);

        }

        }

    }

    }



    /** Listens for when touch tracking begins. */

    interface TrackingStartedListener {

        void onTrackingStarted();

    }



    /** Listens for when shade begins opening of finishes closing. */

    interface OpenCloseListener {

        /** Called when the shade finishes closing. */

        void onClosingFinished();

        /** Called when the shade starts opening. */

        void onOpenStarted();

    }

}

}

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.classifier.Classifier;

import com.android.systemui.classifier.Classifier;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.fragments.FragmentHostManager;

import com.android.systemui.fragments.FragmentHostManager;
@@ -99,6 +98,7 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger; 
import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

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

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

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

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

import com.android.systemui.util.LargeScreenUtils;

import com.android.systemui.util.LargeScreenUtils;
@@ -113,7 +113,7 @@ import javax.inject.Inject; 
/** Handles QuickSettings touch handling, expansion and animation state

/** Handles QuickSettings touch handling, expansion and animation state

 * TODO (b/264460656) make this dumpable

 * TODO (b/264460656) make this dumpable

 */

 */

@SysUISingleton

@CentralSurfacesComponent.CentralSurfacesScope

public class QuickSettingsController implements Dumpable {

public class QuickSettingsController implements Dumpable {

    public static final String TAG = "QuickSettingsController";

    public static final String TAG = "QuickSettingsController";

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,8 @@ public interface ShadeController { 
            NotificationShadeWindowViewController notificationShadeWindowViewController);

            NotificationShadeWindowViewController notificationShadeWindowViewController);





    /** */

    /** */

    void setShadeViewController(ShadeViewController shadeViewController);

    void setNotificationPanelViewController(

            NotificationPanelViewController notificationPanelViewController);





    /** Listens for shade visibility changes. */

    /** Listens for shade visibility changes. */

    interface ShadeVisibilityListener {

    interface ShadeVisibilityListener {

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -70,8 +70,7 @@ public final class ShadeControllerImpl implements ShadeController { 




    private boolean mExpandedVisible;

    private boolean mExpandedVisible;





    // TODO(b/237661616): Rename this variable to mShadeViewController.

    private NotificationPanelViewController mNotificationPanelViewController;

    private ShadeViewController mNotificationPanelViewController;

    private NotificationPresenter mPresenter;

    private NotificationPresenter mPresenter;

    private NotificationShadeWindowViewController mNotificationShadeWindowViewController;

    private NotificationShadeWindowViewController mNotificationShadeWindowViewController;

    private ShadeVisibilityListener mShadeVisibilityListener;

    private ShadeVisibilityListener mShadeVisibilityListener;
@@ -427,11 +426,12 @@ public final class ShadeControllerImpl implements ShadeController { 
    }

    }





    @Override

    @Override

    public void setShadeViewController(ShadeViewController shadeViewController) {

    public void setNotificationPanelViewController(

        mNotificationPanelViewController = shadeViewController;

            NotificationPanelViewController notificationPanelViewController) {

        mNotificationPanelViewController = notificationPanelViewController;

        mNotificationPanelViewController.setTrackingStartedListener(this::runPostCollapseRunnables);

        mNotificationPanelViewController.setTrackingStartedListener(this::runPostCollapseRunnables);

        mNotificationPanelViewController.setOpenCloseListener(

        mNotificationPanelViewController.setOpenCloseListener(

                new OpenCloseListener() {

                new NotificationPanelViewController.OpenCloseListener() {

                    @Override

                    @Override

                    public void onClosingFinished() {

                    public void onClosingFinished() {

                        ShadeControllerImpl.this.onClosingFinished();

                        ShadeControllerImpl.this.onClosingFinished();