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

Commit 4d220330 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix clock being clipped in lockscreen after opening... 

Merge "Revert "Fix clock being clipped in lockscreen after opening notification shade and unlocking"" into main
parents 67de832d 33e74ca0

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

+6 −9
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.statusbar.CommandQueue 
import com.android.systemui.statusbar.notification.NotificationUtils.interpolate

import com.android.systemui.statusbar.notification.stack.domain.interactor.SharedNotificationContainerInteractor

import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine

import com.android.systemui.util.kotlin.Utils.Companion.sampleFilter

import com.android.systemui.util.kotlin.pairwise

import com.android.systemui.util.kotlin.sample

import javax.inject.Inject
@@ -250,17 +251,13 @@ constructor( 


    /** Keyguard can be clipped at the top as the shade is dragged */

    val topClippingBounds: Flow<Int?> by lazy {

        combineTransform(

        repository.topClippingBounds

            .sampleFilter(

                keyguardTransitionInteractor

                    .transitionValue(scene = Scenes.Gone, stateWithoutSceneContainer = GONE)

                    .map { it == 1f }

                    .onStart { emit(false) }

                    .distinctUntilChanged(),

                repository.topClippingBounds

            ) { isGone, topClippingBounds ->

                if (!isGone) {

                    emit(topClippingBounds)

                }

                    .onStart { emit(0f) }

            ) { goneValue ->

                goneValue != 1f

            }

            .distinctUntilChanged()

    }