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

Commit c3fd1b56 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Revert "Clean and consolidate objects" 

This reverts commit b745d8e6.

Reason for revert: Broken build https://android-build.corp.google.com/quarterdeck/?branch=git_main&target=husky-trunk-userdebug&lkgb=13919093&fkbb=13919226

Bug: 420960164
Change-Id: I16df8d63555b4afff59af6c91b1c3b9715c519af
parent b745d8e6

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.compose.animation.scene.animateContentFloatAsState 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.viewmodel.LockscreenUserActionsViewModel

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.qs.shared.ui.QuickSettings

import com.android.systemui.qs.ui.composable.QuickSettings

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

import com.android.systemui.scene.ui.composable.Scene

import dagger.Lazy

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsSecurityButtonVi 
import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.qs.footer.ui.viewmodel.FooterTextButtonViewModel

import com.android.systemui.qs.panels.ui.viewmodel.TextFeedbackViewModel

import com.android.systemui.qs.shared.ui.QuickSettings

import com.android.systemui.qs.ui.composable.QuickSettings

import com.android.systemui.qs.ui.composable.QuickSettingsTheme

import com.android.systemui.qs.ui.compose.borderOnFocus

import com.android.systemui.res.R

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt

+13 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.compose.ui.unit.dp 
import androidx.compose.ui.viewinterop.AndroidView

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.animation.scene.ContentScope

import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.MovableElementContentPicker

import com.android.compose.animation.scene.MovableElementKey

import com.android.compose.animation.scene.SceneTransitionLayoutState
@@ -44,13 +45,11 @@ import com.android.compose.animation.scene.ValueKey 
import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.modifiers.thenIf

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.qs.shared.ui.QuickSettings

import com.android.systemui.qs.ui.adapter.QSSceneAdapter

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Companion.Collapsing

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Expanding

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.UnsquishingQQS

import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.UnsquishingQS

import com.android.systemui.qs.ui.composable.QuickSettings.Elements.Content

import com.android.systemui.res.R

import com.android.systemui.scene.shared.model.Scenes
@@ -63,9 +62,20 @@ object QuickSettings { 
                "QuickSettingsContent",

                contentPicker = MovableElementContentPicker(SCENES),

            )

        val QuickQuickSettings = ElementKey("QuickQuickSettings")

        val SplitShadeQuickSettings = ElementKey("SplitShadeQuickSettings")

        val FooterActions = ElementKey("QuickSettingsFooterActions")

    }



    object SharedValues {

        val TilesSquishiness = ValueKey("QuickSettingsTileSquishiness")



        object SquishinessValues {

            val Default = 1f

            val LockscreenSceneStarting = 0f

            val GoneSceneStarting = 0.3f

        }



        val MediaLandscapeTopOffset = ValueKey("MediaLandscapeTopOffset")



        object MediaOffset {
@@ -164,7 +174,7 @@ fun ContentScope.QuickSettings( 
    }



    MovableElement(

        key = Content,

        key = QuickSettings.Elements.Content,

        modifier =

            modifier.sysuiResTag("quick_settings_panel").fillMaxWidth().layout {

                measurable,

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.systemui.media.remedia.ui.compose.Media 
import com.android.systemui.media.remedia.ui.compose.MediaPresentationStyle

import com.android.systemui.qs.composefragment.ui.GridAnchor

import com.android.systemui.qs.panels.ui.compose.TileGrid

import com.android.systemui.qs.shared.ui.QuickSettings.Elements

import com.android.systemui.qs.shared.ui.ElementKeys

import com.android.systemui.qs.ui.viewmodel.QuickSettingsContainerViewModel

import com.android.systemui.res.R
@@ -88,7 +88,7 @@ fun ContentScope.QuickSettingsContent( 
            },

        mediaInRow = mediaInRow,

        modifier =

            Modifier.element(Elements.QuickSettingsContent)

            Modifier.element(ElementKeys.QuickSettingsContent)

                .padding(horizontal = dimensionResource(id = R.dimen.qs_horizontal_margin))

                .sysuiResTag("quick_settings_panel"),

    )

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import com.android.systemui.notifications.ui.composable.NotificationScrollingSta 
import com.android.systemui.qs.composefragment.ui.GridAnchor

import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility

import com.android.systemui.qs.panels.ui.compose.EditMode

import com.android.systemui.qs.shared.ui.QuickSettings

import com.android.systemui.qs.ui.composable.QuickSettingsScene.Companion.InternalScenes.Edit

import com.android.systemui.qs.ui.composable.QuickSettingsScene.Companion.InternalScenes.QS

import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneContentViewModel