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

Commit baac142a authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge "Exclude ViewPager2 from default transition in KeyguardClockViewBinder." into main

parents 3e401580 3da8a68a

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.keyguard.ui.binder



import android.transition.AutoTransition

import android.transition.TransitionManager

import android.transition.TransitionSet

import android.view.View.INVISIBLE
@@ -26,6 +27,7 @@ import androidx.constraintlayout.widget.ConstraintLayout 
import androidx.constraintlayout.widget.ConstraintSet

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import androidx.viewpager2.widget.ViewPager2

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

import com.android.systemui.keyguard.domain.interactor.KeyguardBlueprintInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
@@ -47,6 +49,7 @@ import kotlinx.coroutines.flow.map 


object KeyguardClockViewBinder {

    private val TAG = KeyguardClockViewBinder::class.simpleName!!

    private val defaultTransition = AutoTransition().excludeTarget(ViewPager2::class.java, true)



    @JvmStatic

    fun bind(
@@ -242,7 +245,7 @@ object KeyguardClockViewBinder { 
        clockSection.applyConstraints(constraintSet)

        if (animated) {

            set?.let { TransitionManager.beginDelayedTransition(rootView, it) }

                ?: run { TransitionManager.beginDelayedTransition(rootView) }

                ?: run { TransitionManager.beginDelayedTransition(rootView, defaultTransition) }

        }

        constraintSet.applyTo(rootView)

    }