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

Commit b1c9975a authored by Andreas Miko's avatar Andreas Miko Committed by Android (Google) Code Review
Browse files

Merge changes I68f6241c,Ib95b8df3 into main 

* changes:
  Migrate LIGHT_REVEAL_MIGRATION to aconfig
  Migrate NEW_AOD_TRANSITION to aconfig
parents 0066fa80 980ef67d

packages/SystemUI/aconfig/systemui.aconfig

+14 −0
Original line number Diff line number Diff line
@@ -127,3 +127,17 @@ 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"

}



flag {

    name: "light_reveal_migration"

    namespace: "systemui"

    description: "Move LightRevealScrim to recommended architecture"

    bug: "281655028"

}
 
 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/biometrics/AuthRippleController.kt

+3 −3
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback 
import com.android.keyguard.logging.KeyguardLogger

import com.android.settingslib.Utils

import com.android.systemui.CoreStartable

import com.android.systemui.Flags.lightRevealMigration

import com.android.systemui.res.R

import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.WakefulnessLifecycle

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

import com.android.systemui.plugins.statusbar.StatusBarStateController
@@ -191,7 +191,7 @@ class AuthRippleController @Inject constructor( 


        // This code path is not used if the KeyguardTransitionRepository is managing the light

        // reveal scrim.

        if (!featureFlags.isEnabled(Flags.LIGHT_REVEAL_MIGRATION)) {

        if (!lightRevealMigration()) {

            if (statusBarStateController.isDozing || biometricUnlockController.isWakeAndUnlock) {

                circleReveal?.let {

                    lightRevealScrim.revealAmount = 0f
@@ -210,7 +210,7 @@ class AuthRippleController @Inject constructor( 
    }



    override fun onKeyguardFadingAwayChanged() {

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

        if (lightRevealMigration()) {

            return

        }

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

+0 −12
Original line number Diff line number Diff line
@@ -148,18 +148,6 @@ object Flags { 
    // TODO(b/255607168): Tracking Bug

    @JvmField val DOZING_MIGRATION_1 = unreleasedFlag("dozing_migration_1")



    /**

     * Migrates control of the LightRevealScrim's reveal effect and amount from legacy code to the

     * new KeyguardTransitionRepository.

     */

    // TODO(b/281655028): Tracking bug

    @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)