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

Commit a6c9dae6 authored by Andreas Miko's avatar Andreas Miko
Browse files

Migrate NEW_AOD_TRANSITION to aconfig 

Test: NONE
Bug: b/301915812
Flag: ACONFIG com.android.systemui.Flags.FLAG_NEW_AOD_TRANSITION DEVELOPMENT
Change-Id: Ib95b8df30e91b22e5d681ccf79b65818e697157a
parent 57ea0232

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -120,3 +120,10 @@ flag { 
        "allow for tracing of coroutine continuations using System UI's tracinglib"

    bug: "289353932"

}



flag {

    name: "new_aod_transition"

    namespace: "systemui"

    description: "New LOCKSCREEN <=> AOD transition"

    bug: "301915812"

}
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static com.android.systemui.Flags.keyguardBottomAreaRefactor; 
import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;

import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1;

import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED;

import static com.android.systemui.flags.Flags.NEW_AOD_TRANSITION;

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

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.annotation.SuppressLint;
@@ -395,7 +395,7 @@ public class LockIconViewController implements Dumpable { 
            mView.updateIcon(ICON_LOCK, true);

            mView.setContentDescription(mLockedLabel);

            mView.setVisibility(View.VISIBLE);

        } else if (mIsDozing && mFeatureFlags.isEnabled(NEW_AOD_TRANSITION)) {

        } else if (mIsDozing && newAodTransition()) {

            mView.animate()

                    .alpha(0f)

                    .setDuration(FADE_OUT_DURATION_MS)

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

+0 −4
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ object Flags { 
    @JvmField

    val LIGHT_REVEAL_MIGRATION = unreleasedFlag("light_reveal_migration", teamfood = true)



    // TODO(b/301915812): Tracking Bug

    @JvmField

    val NEW_AOD_TRANSITION = unreleasedFlag("new_aod_transition", teamfood = true)



    // TODO(b/305984787):

    @JvmField

    val REFACTOR_GETCURRENTUSER = unreleasedFlag("refactor_getcurrentuser", teamfood = true)

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

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ import com.android.internal.jank.InteractionJankMonitor 
import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD

import com.android.keyguard.KeyguardClockSwitch.MISSING_CLOCK_ID

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.newAodTransition

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.common.shared.model.Text

import com.android.systemui.common.shared.model.TintedIcon

import com.android.systemui.common.ui.ConfigurationState

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags

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

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

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
@@ -384,7 +384,7 @@ object KeyguardRootViewBinder { 
                }

                visibility = if (isVisible.value) View.VISIBLE else View.INVISIBLE

            }

            featureFlags.isEnabled(Flags.NEW_AOD_TRANSITION) -> {

            newAodTransition() -> {

                animateInIconTranslation(statusViewMigrated)

                if (isVisible.value) {

                    CrossFadeHelper.fadeIn(this, animatorListener)

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ import android.content.Context 
import android.util.MathUtils

import android.view.View.VISIBLE

import com.android.app.animation.Interpolators

import com.android.systemui.Flags.newAodTransition

import com.android.systemui.common.shared.model.SharedNotificationContainerPosition

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.flags.FeatureFlagsClassic

import com.android.systemui.flags.Flags

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

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

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
@@ -280,7 +280,7 @@ constructor( 
                        dozeParameters.displayNeedsBlanking -> false

                        // We only want the appear animations to happen when the notifications

                        // get fully hidden, since otherwise the un-hide animation overlaps.

                        featureFlags.isEnabled(Flags.NEW_AOD_TRANSITION) -> true

                        newAodTransition() -> true

                        else -> fullyHidden

                    }

                AnimatableEvent(fullyHidden, animate)