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

Commit ab1f6f06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bye-niac" into main 

* changes:
  Remove enabled NotificationIconContainerRefactor flag
  Hard-code NotifIconContainerRefactor flag to true
parents e799f714 c285fc85

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/DozeServiceHostTest.java

+1 −2
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ public class DozeServiceHostTest extends SysuiTestCase { 
    @Mock private PowerManager mPowerManager;

    @Mock private WakefulnessLifecycle mWakefullnessLifecycle;

    @Mock private CentralSurfaces mCentralSurfaces;

    @Mock private NotificationIconAreaController mNotificationIconAreaController;

    @Mock private NotificationShadeWindowViewController mNotificationShadeWindowViewController;

    @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    @Mock private ShadeLockscreenInteractor mShadeLockscreenInteractor;
@@ -106,7 +105,7 @@ public class DozeServiceHostTest extends SysuiTestCase { 
                mHeadsUpManager, mBatteryController, mScrimController,

                () -> mBiometricUnlockController, () -> mAssistManager, mDozeScrimController,

                mKeyguardUpdateMonitor, mPulseExpansionHandler, mNotificationShadeWindowController,

                mNotificationWakeUpCoordinator, mAuthController, mNotificationIconAreaController,

                mNotificationWakeUpCoordinator, mAuthController,

                mShadeLockscreenInteractor, mDozeInteractor);



        mDozeServiceHost.initialize(

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+6 −18
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ import com.android.systemui.statusbar.lockscreen.LockscreenSmartspaceController; 
import com.android.systemui.statusbar.notification.AnimatableProperty;

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

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerAlwaysOnDisplayViewBinder;

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor;

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

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

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

import com.android.systemui.util.ViewController;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -87,7 +85,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    private final StatusBarStateController mStatusBarStateController;

    private final ClockRegistry mClockRegistry;

    private final KeyguardSliceViewController mKeyguardSliceViewController;

    private final NotificationIconAreaController mNotificationIconAreaController;

    private final LockscreenSmartspaceController mSmartspaceController;

    private final SecureSettings mSecureSettings;

    private final DumpManager mDumpManager;
@@ -165,7 +162,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            StatusBarStateController statusBarStateController,

            ClockRegistry clockRegistry,

            KeyguardSliceViewController keyguardSliceViewController,

            NotificationIconAreaController notificationIconAreaController,

            LockscreenSmartspaceController smartspaceController,

            NotificationIconContainerAlwaysOnDisplayViewBinder nicViewBinder,

            KeyguardUnlockAnimationController keyguardUnlockAnimationController,
@@ -183,7 +179,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mStatusBarStateController = statusBarStateController;

        mClockRegistry = clockRegistry;

        mKeyguardSliceViewController = keyguardSliceViewController;

        mNotificationIconAreaController = notificationIconAreaController;

        mSmartspaceController = smartspaceController;

        mNicViewBinder = nicViewBinder;

        mSecureSettings = secureSettings;
@@ -351,10 +346,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    int getNotificationIconAreaHeight() {

        if (MigrateClocksToBlueprint.isEnabled()) {

            return 0;

        } else if (NotificationIconContainerRefactor.isEnabled()) {

            return mAodIconContainer != null ? mAodIconContainer.getHeight() : 0;

        } else {

            return mNotificationIconAreaController.getHeight();

            return mAodIconContainer != null ? mAodIconContainer.getHeight() : 0;

        }

    }
@@ -603,7 +596,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            NotificationIconContainer nic = (NotificationIconContainer)

                    mView.findViewById(

                            com.android.systemui.res.R.id.left_aligned_notification_icon_container);

            if (NotificationIconContainerRefactor.isEnabled()) {

            if (mAodIconsBindHandle != null) {

                mAodIconsBindHandle.dispose();

            }
@@ -611,10 +603,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
                mAodIconsBindHandle = mNicViewBinder.bindWhileAttached(nic);

                mAodIconContainer = nic;

            }

            } else {

                mNotificationIconAreaController.setupAodIcons(nic);

                mAodIconContainer = nic;

            }

        }

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationRowCom 
import com.android.systemui.statusbar.phone.CentralSurfaces;

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

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

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

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;

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

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -230,7 +229,6 @@ import javax.inject.Named; 
        MediaProjectionTaskSwitcherModule.class,

        MediaRouterModule.class,

        MotionToolModule.class,

        NotificationIconAreaControllerModule.class,

        PeopleHubModule.class,

        PeopleModule.class,

        PluginModule.class,

packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt

+0 −5
Original line number Diff line number Diff line
@@ -39,14 +39,11 @@ import com.android.systemui.qs.flags.QSComposeFragment 
import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.shared.flag.DualShade

import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor

import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor

import com.android.systemui.statusbar.notification.shared.NotificationMinimalismPrototype

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import com.android.systemui.statusbar.notification.shared.NotificationsHeadsUpRefactor

import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor

import com.android.systemui.statusbar.notification.shared.PriorityPeopleSection

import javax.inject.Inject
@@ -61,8 +58,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        modesUi dependsOn modesApi



        // Internal notification frontend dependencies

        NotificationsLiveDataStoreRefactor.token dependsOn NotificationIconContainerRefactor.token

        FooterViewRefactor.token dependsOn NotificationIconContainerRefactor.token

        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        PriorityPeopleSection.token dependsOn SortBySectionTimeFlag.token

        NotificationMinimalismPrototype.token dependsOn NotificationsHeadsUpRefactor.token

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+12 −16
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import com.android.systemui.res.R 
import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.CrossFadeHelper

import com.android.systemui.statusbar.VibratorHelper

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor

import com.android.systemui.statusbar.phone.ScreenOffAnimationController

import com.android.systemui.temporarydisplay.ViewPriority

import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator
@@ -292,7 +291,6 @@ object KeyguardRootViewBinder { 
                            }

                        }



                        if (NotificationIconContainerRefactor.isEnabled) {

                        launch {

                            val iconsAppearTranslationPx =

                                configuration
@@ -307,7 +305,6 @@ object KeyguardRootViewBinder { 
                                    )

                            }

                        }

                        }



                        interactionJankMonitor?.let { jankMonitor ->

                            launch {
@@ -519,7 +516,6 @@ object KeyguardRootViewBinder { 
        if (MigrateClocksToBlueprint.isEnabled) {

            throw IllegalStateException("should only be called in legacy code paths")

        }

        if (NotificationIconContainerRefactor.isUnexpectedlyInLegacyMode()) return

        coroutineScope {

            val iconAppearTranslationPx =

                configuration.getDimensionPixelSize(R.dimen.shelf_appear_translation).stateIn(this)