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

Commit cf2d8b4b authored by Matt Pietal's avatar Matt Pietal
Browse files

Merge NSSL and CLOCK migration flags 

It will be easier to progress these as a unit.

Fixes: 325271165
Test: atest SystemUITests
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
DEVELOPMENT
Flag: ACONFIG com.android.systemui.keyguard_bottom_area_refactor
STAGING

Change-Id: I084b838d17d7e7330421864e1ed2d47ec92a8c23
parent b93677ce

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+28 −27
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ import android.view.ViewGroup 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

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

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl

import com.android.systemui.notifications.ui.composable.NotificationStack

import com.android.systemui.scene.shared.flag.SceneContainerFlags

import com.android.systemui.statusbar.notification.stack.AmbientState
@@ -59,7 +59,9 @@ constructor( 
) {



    init {

        if (!KeyguardShadeMigrationNssl.isUnexpectedlyInLegacyMode()) {

        if (!migrateClocksToBlueprint()) {

            throw IllegalStateException("this requires migrateClocksToBlueprint()")

        }

        // This scene container section moves the NSSL to the SharedNotificationContainer.

        // This also requires that SharedNotificationContainer gets moved to the

        // SceneWindowRootView by the SceneWindowRootViewBinder. Prior to Scene Container,
@@ -91,7 +93,6 @@ constructor( 
            )

        }

    }

    }



    @Composable

    fun SceneScope.Notifications(modifier: Modifier = Modifier) {

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+2 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.systemui.flags.FeatureFlagsClassic 
import com.android.systemui.flags.Flags.REGION_SAMPLING

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl

import com.android.systemui.keyguard.shared.model.TransitionState

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.log.core.Logger
@@ -316,7 +315,7 @@ constructor( 
        object : KeyguardUpdateMonitorCallback() {

            override fun onKeyguardVisibilityChanged(visible: Boolean) {

                isKeyguardVisible = visible

                if (!KeyguardShadeMigrationNssl.isEnabled) {

                if (!migrateClocksToBlueprint()) {

                    if (!isKeyguardVisible) {

                        clock?.run {

                            smallClock.animations.doze(if (isDozing) 1f else 0f)
@@ -410,7 +409,7 @@ constructor( 
            parent.repeatWhenAttached {

                repeatOnLifecycle(Lifecycle.State.CREATED) {

                    listenForDozing(this)

                    if (KeyguardShadeMigrationNssl.isEnabled) {

                    if (migrateClocksToBlueprint()) {

                        listenForDozeAmountTransition(this)

                        listenForAnyStateToAodTransition(this)

                    } else {

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

+2 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.systemui.flags.FeatureFlagsClassic; 
import com.android.systemui.keyguard.KeyguardUnlockAnimationController;

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl;

import com.android.systemui.keyguard.ui.view.InWindowLauncherUnlockAnimationManager;

import com.android.systemui.log.LogBuffer;

import com.android.systemui.log.core.LogLevel;
@@ -349,7 +348,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    }



    int getNotificationIconAreaHeight() {

        if (KeyguardShadeMigrationNssl.isEnabled()) {

        if (migrateClocksToBlueprint()) {

            return 0;

        } else if (NotificationIconContainerRefactor.isEnabled()) {

            return mAodIconContainer != null ? mAodIconContainer.getHeight() : 0;
@@ -597,7 +596,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
    }



    private void updateAodIcons() {

        if (!KeyguardShadeMigrationNssl.isEnabled()) {

        if (!migrateClocksToBlueprint()) {

            NotificationIconContainer nic = (NotificationIconContainer)

                    mView.findViewById(

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

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

+2 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import com.android.systemui.animation.ViewHierarchyAnimator; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor;

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl;

import com.android.systemui.keyguard.shared.model.TransitionState;

import com.android.systemui.keyguard.shared.model.TransitionStep;

import com.android.systemui.plugins.clocks.ClockController;
@@ -231,7 +230,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        }



        mDumpManager.registerDumpable(getInstanceName(), this);

        if (KeyguardShadeMigrationNssl.isEnabled()) {

        if (migrateClocksToBlueprint()) {

            startCoroutines(EmptyCoroutineContext.INSTANCE);

        }

    }
@@ -511,7 +510,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
        ConstraintSet constraintSet = new ConstraintSet();

        constraintSet.clone(layout);

        int guideline;

        if (KeyguardShadeMigrationNssl.isEnabled()) {

        if (migrateClocksToBlueprint()) {

            guideline = R.id.split_shade_guideline;

        } else {

            guideline = R.id.qs_edge_guideline;

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

+4 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.keyguard;



import static com.android.systemui.Flags.migrateClocksToBlueprint;

import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;
@@ -23,7 +24,6 @@ import android.util.Property; 
import android.view.View;



import com.android.app.animation.Interpolators;

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl;

import com.android.systemui.log.LogBuffer;

import com.android.systemui.log.core.LogLevel;

import com.android.systemui.statusbar.StatusBarState;
@@ -109,7 +109,7 @@ public class KeyguardVisibilityHelper { 
                animProps.setDelay(0).setDuration(160);

                log("goingToFullShade && !keyguardFadingAway");

            }

            if (KeyguardShadeMigrationNssl.isEnabled()) {

            if (migrateClocksToBlueprint()) {

                log("Using LockscreenToGoneTransition 1");

            } else {

                PropertyAnimator.setProperty(
@@ -167,7 +167,7 @@ public class KeyguardVisibilityHelper { 
                        animProps,

                        true /* animate */);

            } else if (mScreenOffAnimationController.shouldAnimateInKeyguard()) {

                if (KeyguardShadeMigrationNssl.isEnabled()) {

                if (migrateClocksToBlueprint()) {

                    log("Using GoneToAodTransition");

                    mKeyguardViewVisibilityAnimating = false;

                } else {
@@ -183,7 +183,7 @@ public class KeyguardVisibilityHelper { 
                mView.setVisibility(View.VISIBLE);

            }

        } else {

            if (KeyguardShadeMigrationNssl.isEnabled()) {

            if (migrateClocksToBlueprint()) {

                log("Using LockscreenToGoneTransition 2");

            } else {

                log("Direct set Visibility to GONE");