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

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

Merge "Ensure we only restrict swipe to hub when v2 enabled" into main

parents 4d872d48 170009ab

packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt

+9 −6
Original line number Diff line number Diff line
@@ -377,12 +377,15 @@ constructor( 
                MutableStateFlow(false)

            }



        if (v2FlagEnabled()) {

            val inAllowedKeyguardState =

                keyguardTransitionInteractor.startedKeyguardTransitionStep.map {

                    it.to == KeyguardState.LOCKSCREEN || it.to == KeyguardState.GLANCEABLE_HUB

                }



            allOf(inAllowedDeviceState, inAllowedKeyguardState)

        } else {

            inAllowedDeviceState

        }

    }



    companion object {