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

Commit d66cacf5 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Revert^2 "Fix clock being clipped in lockscreen after opening notification shade and unlocking" 

This reverts commit 33e74ca0.

Reason for revert: This CL fixes broken CUJs, and simply reverts the CL (ag/27510226) that broke it.

Change-Id: Iddb2f0cca87a079352e1ccff7df2218e04f7b1e2
parent 33e74ca0

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

+9 −6
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 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
@@ -251,13 +250,17 @@ constructor( 


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

    val topClippingBounds: Flow<Int?> by lazy {

        repository.topClippingBounds

            .sampleFilter(

        combineTransform(

                keyguardTransitionInteractor

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

                    .onStart { emit(0f) }

            ) { goneValue ->

                goneValue != 1f

                    .map { it == 1f }

                    .onStart { emit(false) }

                    .distinctUntilChanged(),

                repository.topClippingBounds

            ) { isGone, topClippingBounds ->

                if (!isGone) {

                    emit(topClippingBounds)

                }

            }

            .distinctUntilChanged()

    }