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

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

Merge "Add logging when goingAway is ignored" into main

parents 7548a3e0 85d63579

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt

+5 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.keyguard.domain.interactor

package com.android.systemui.keyguard.domain.interactor





import android.animation.ValueAnimator

import android.animation.ValueAnimator

import android.util.Log

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.Flags

import com.android.systemui.Flags

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
@@ -199,6 +200,10 @@ constructor( 
                        Flags.hubEditModeTransition() && editModeState == EditModeState.STARTING ||

                        Flags.hubEditModeTransition() && editModeState == EditModeState.STARTING ||

                            editModeState == EditModeState.SHOWING

                            editModeState == EditModeState.SHOWING

                    ) {

                    ) {

                        Log.i(

                            TAG,

                            "Ignoring isKeyguardGoingAway due to editModeState: $editModeState",

                        )

                        // If transitioning to hub edit mode, do nothing here. The keyguard state

                        // If transitioning to hub edit mode, do nothing here. The keyguard state

                        // change to GONE happens as a result of moving away from the communal

                        // change to GONE happens as a result of moving away from the communal

                        // scene, which is triggered by the edit mode activity.

                        // scene, which is triggered by the edit mode activity.

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromPrimaryBouncerTransitionInteractor.kt

+4 −0
Original line number Original line Diff line number Diff line
@@ -267,6 +267,10 @@ constructor( 
                        Flags.hubEditModeTransition() && editModeState == EditModeState.STARTING ||

                        Flags.hubEditModeTransition() && editModeState == EditModeState.STARTING ||

                            editModeState == EditModeState.SHOWING

                            editModeState == EditModeState.SHOWING

                    ) {

                    ) {

                        Log.i(

                            TAG,

                            "Ignoring isKeyguardGoingAway due to editModeState: $editModeState",

                        )

                        // If transitioning to hub edit mode, do nothing here. The keyguard state

                        // If transitioning to hub edit mode, do nothing here. The keyguard state

                        // change to GONE happens as a result of moving away from the communal

                        // change to GONE happens as a result of moving away from the communal

                        // scene, which is triggered by the edit mode activity.

                        // scene, which is triggered by the edit mode activity.