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

Commit 11c52cb5 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Remove the fork of STL ObservableTransitionState 

Bug: 293899074
Test: m sysuig
Test: m SystemUITests
Test: Manual, enabled Flexiglass and used it.
Flag: N/A
Change-Id: I125610c10cc12d54b6789e8923e69bb9ab3343c8
parent 1e2e36c7

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/ComposeUnawareExtensions.kt

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.scene.ui.composable



import com.android.compose.animation.scene.ObservableTransitionState as ComposeAwareObservableTransitionState

import com.android.systemui.scene.shared.model.ObservableTransitionState



fun ComposeAwareObservableTransitionState.asComposeUnaware(): ObservableTransitionState {

    return when (this) {

        is ComposeAwareObservableTransitionState.Idle -> ObservableTransitionState.Idle(scene)

        is ComposeAwareObservableTransitionState.Transition ->

            ObservableTransitionState.Transition(

                fromScene = fromScene,

                toScene = toScene,

                progress = progress,

                isInitiatedByUserInput = isInitiatedByUserInput,

                isUserInputOngoing = isUserInputOngoing,

            )

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/SceneContainer.kt

+1 −3
Original line number Diff line number Diff line
@@ -90,9 +90,7 @@ fun SceneContainer( 
    }



    DisposableEffect(viewModel, state) {

        viewModel.setTransitionState(

            state.observableTransitionState().map { it.asComposeUnaware() }

        )

        viewModel.setTransitionState(state.observableTransitionState())

        onDispose { viewModel.setTransitionState(null) }

    }

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.WindowInsetsController 
import android.widget.FrameLayout

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.internal.logging.MetricsLogger

import com.android.internal.logging.UiEventLogger

import com.android.internal.widget.LockPatternUtils
@@ -65,7 +66,6 @@ import com.android.systemui.scene.domain.interactor.SceneInteractor 
import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags

import com.android.systemui.scene.shared.model.FakeSceneDataSource

import com.android.systemui.scene.shared.model.ObservableTransitionState

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.fakeSceneDataSource

import com.android.systemui.shared.Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR

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

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package com.android.systemui.keyguard.domain.interactor 
import android.app.StatusBarManager

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository

import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository
@@ -35,7 +36,6 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.power.domain.interactor.PowerInteractorFactory

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags

import com.android.systemui.scene.shared.model.ObservableTransitionState

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.data.repository.FakeShadeRepository

import com.android.systemui.testKosmos

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.telecom.TelecomManager 
import android.telephony.TelephonyManager

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.compose.animation.scene.SceneKey

import com.android.internal.R

import com.android.internal.util.EmergencyAffordanceManager
@@ -62,7 +63,6 @@ import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter 
import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.startable.SceneContainerStartable

import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags

import com.android.systemui.scene.shared.model.ObservableTransitionState

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.fakeSceneDataSource

import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel