Revert "Clean and consolidate objects"
This reverts commit b745d8e6bd26715a49950ede260331d86581dd3e.
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
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt
index a3af46d..4d9747f 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt
@@ -27,7 +27,7 @@
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
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
index 3db005a..3bd2a4e 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt
@@ -105,7 +105,7 @@
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
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
index db4bfe8..fe5c72f 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
@@ -37,6 +37,7 @@
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.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 @@
"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 @@
}
MovableElement(
- key = Content,
+ key = QuickSettings.Elements.Content,
modifier =
modifier.sysuiResTag("quick_settings_panel").fillMaxWidth().layout {
measurable,
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt
index f889430..903c38f 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsContent.kt
@@ -39,7 +39,7 @@
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 @@
},
mediaInRow = mediaInRow,
modifier =
- Modifier.element(Elements.QuickSettingsContent)
+ Modifier.element(ElementKeys.QuickSettingsContent)
.padding(horizontal = dimensionResource(id = R.dimen.qs_horizontal_margin))
.sysuiResTag("quick_settings_panel"),
)
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
index 6dc34e5..d9e49a9 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt
@@ -78,7 +78,6 @@
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
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
index bcf257e..b25cafb 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt
@@ -39,7 +39,7 @@
import com.android.systemui.lifecycle.rememberViewModel
import com.android.systemui.notifications.ui.composable.SnoozeableHeadsUpNotificationSpace
import com.android.systemui.notifications.ui.composable.headsUpTopInset
-import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.Default
import com.android.systemui.scene.shared.model.Overlays
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToSplitShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToSplitShadeTransition.kt
index 04e0cde..b53c4e238 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToSplitShadeTransition.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromGoneToSplitShadeTransition.kt
@@ -21,7 +21,7 @@
import com.android.compose.animation.scene.UserActionDistance
import com.android.systemui.media.controls.ui.composable.MediaCarousel
import com.android.systemui.notifications.ui.composable.Notifications
-import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.shade.ui.composable.Shade
import com.android.systemui.shade.ui.composable.ShadeHeader
import kotlin.time.Duration.Companion.milliseconds
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToSplitShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToSplitShadeTransition.kt
index da48755..6c8885e 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToSplitShadeTransition.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromLockscreenToSplitShadeTransition.kt
@@ -20,7 +20,7 @@
import com.android.compose.animation.scene.TransitionBuilder
import com.android.compose.animation.scene.UserActionDistance
import com.android.systemui.notifications.ui.composable.Notifications
-import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.shade.ui.composable.Shade
import com.android.systemui.shade.ui.composable.ShadeHeader
import kotlin.time.Duration.Companion.milliseconds
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt
index 17ee419..016c34c 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromShadeToQuickSettingsTransition.kt
@@ -9,7 +9,8 @@
import com.android.compose.animation.scene.UserActionDistance
import com.android.systemui.media.remedia.ui.compose.Media.Elements.mediaCarousel
import com.android.systemui.notifications.ui.composable.Notifications
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements
+import com.android.systemui.qs.shared.ui.ElementKeys
+import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.scene.shared.model.Scenes
import com.android.systemui.shade.ui.composable.ShadeHeader
import kotlin.time.Duration.Companion.milliseconds
@@ -28,20 +29,20 @@
}
translate(Notifications.Elements.NotificationScrim, Edge.Bottom)
- timestampRange(endMillis = 83) { fade(Elements.FooterActions) }
+ timestampRange(endMillis = 83) { fade(QuickSettings.Elements.FooterActions) }
- fractionRange(start = 0.43f) { fade(Elements.QuickSettingsContent) }
+ fractionRange(start = 0.43f) { fade(ElementKeys.QuickSettingsContent) }
- anchoredTranslate(Elements.QuickSettingsContent, Elements.GridAnchor)
+ anchoredTranslate(ElementKeys.QuickSettingsContent, ElementKeys.GridAnchor)
- sharedElement(Elements.TileElementMatcher, enabled = animateQsTilesAsShared())
+ sharedElement(ElementKeys.TileElementMatcher, enabled = animateQsTilesAsShared())
// This will animate between 0f (QQS) and 0.5, fading in the QQS tiles when coming back
// from non first page QS. The QS content ends fading out at 0.43f, so there's a brief
// overlap, but because they are really faint, it looks better than complete black without
// overlap.
fractionRange(end = 0.5f) { fade(QqsTileElementMatcher) }
- anchoredTranslate(QqsTileElementMatcher, Elements.GridAnchor)
+ anchoredTranslate(QqsTileElementMatcher, ElementKeys.GridAnchor)
fade(mediaCarousel)
val translationY = ShadeHeader.Dimensions.CollapsedHeightForTransitions
@@ -69,6 +70,6 @@
private val QqsTileElementMatcher =
object : ElementMatcher {
override fun matches(key: ElementKey, content: ContentKey): Boolean {
- return content == Scenes.Shade && Elements.TileElementMatcher.matches(key, content)
+ return content == Scenes.Shade && ElementKeys.TileElementMatcher.matches(key, content)
}
}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsTransition.kt
index fee0982..b5e1f67 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsTransition.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsTransition.kt
@@ -20,7 +20,7 @@
import com.android.compose.animation.scene.Edge
import com.android.compose.animation.scene.TransitionBuilder
import com.android.systemui.notifications.ui.composable.Notifications
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements
+import com.android.systemui.qs.shared.ui.ElementKeys
import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.qs.ui.composable.QuickSettingsScene
import com.android.systemui.shade.ui.composable.ShadeHeader
@@ -48,7 +48,7 @@
// Old QSSceneAdapter element
translate(QuickSettings.Elements.Content, y = -ShadeHeader.Dimensions.ExpandedHeight * .66f)
// New all compose element
- translate(Elements.QuickSettingsContent, y = -ShadeHeader.Dimensions.ExpandedHeight * .66f)
+ translate(ElementKeys.QuickSettingsContent, y = -ShadeHeader.Dimensions.ExpandedHeight * .66f)
translate(Notifications.Elements.NotificationScrim, Edge.Top, false)
translate(QuickSettingsScene.Companion.InternalScenes.Edit.rootElementKey, Edge.Top, true)
}
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToShadeTransition.kt b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToShadeTransition.kt
index acd4f6e..4780fab 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToShadeTransition.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToShadeTransition.kt
@@ -21,7 +21,7 @@
import com.android.compose.animation.scene.TransitionBuilder
import com.android.systemui.media.remedia.ui.compose.Media
import com.android.systemui.notifications.ui.composable.Notifications
-import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings
import com.android.systemui.shade.ui.composable.Shade
import com.android.systemui.shade.ui.composable.ShadeHeader
import kotlin.time.Duration.Companion.milliseconds
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
index 8c0c367..bd31a6c 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt
@@ -79,7 +79,8 @@
import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
import com.android.systemui.qs.panels.ui.compose.EditMode
import com.android.systemui.qs.panels.ui.compose.QuickQuickSettings
-import com.android.systemui.qs.shared.ui.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings
+import com.android.systemui.qs.ui.composable.QuickSettings.Elements.SplitShadeQuickSettings
import com.android.systemui.qs.ui.composable.QuickSettingsContent
import com.android.systemui.qs.ui.composable.QuickSettingsShade
import com.android.systemui.res.R
@@ -104,6 +105,7 @@
object Elements {
val BackgroundScrim =
ElementKey("ShadeBackgroundScrim", contentPicker = LowestZIndexContentPicker)
+ val SplitShadeStartColumn = ElementKey("SplitShadeStartColumn")
}
object Dimensions {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt
index 07cb3b4..0906ea8 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt
@@ -149,7 +149,7 @@
import com.android.systemui.qs.panels.ui.compose.EditMode
import com.android.systemui.qs.panels.ui.compose.QuickQuickSettings
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.composable.QuickSettingsShade
import com.android.systemui.qs.ui.composable.QuickSettingsShade.systemGestureExclusionInShade
import com.android.systemui.qs.ui.composable.QuickSettingsTheme
@@ -804,7 +804,7 @@
)
) {
if (viewModel.isQsEnabled) {
- Element(Elements.QuickSettingsContent, modifier = Modifier.weight(1f)) {
+ Element(ElementKeys.QuickSettingsContent, modifier = Modifier.weight(1f)) {
if (alwaysCompose) {
// scrollState never changes
LaunchedEffect(Unit) {
@@ -957,7 +957,7 @@
}
QuickSettingsTheme {
Element(
- Elements.FooterActions,
+ ElementKeys.FooterActions,
Modifier.sysuiResTag(ResIdTags.qsFooterActions),
) {
FooterActions(
@@ -1095,7 +1095,7 @@
object : ElementMatcher {
override fun matches(key: ElementKey, content: ContentKey): Boolean {
return content == SceneKeys.QuickQuickSettings &&
- Elements.TileElementMatcher.matches(key, content)
+ ElementKeys.TileElementMatcher.matches(key, content)
}
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt
index 64cd529..82afdff 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/FromQuickQuickSettingsToQuickSettings.kt
@@ -18,24 +18,24 @@
import com.android.compose.animation.scene.TransitionBuilder
import com.android.systemui.qs.composefragment.SceneKeys
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements
+import com.android.systemui.qs.shared.ui.ElementKeys
fun TransitionBuilder.quickQuickSettingsToQuickSettings(
animateTilesExpansion: () -> Boolean = { true }
) {
- fractionRange(start = 0.43f) { fade(Elements.QuickSettingsContent) }
+ fractionRange(start = 0.43f) { fade(ElementKeys.QuickSettingsContent) }
- fractionRange(start = 0.9f) { fade(Elements.FooterActions) }
+ fractionRange(start = 0.9f) { fade(ElementKeys.FooterActions) }
- anchoredTranslate(Elements.QuickSettingsContent, Elements.GridAnchor)
+ anchoredTranslate(ElementKeys.QuickSettingsContent, ElementKeys.GridAnchor)
- sharedElement(Elements.TileElementMatcher, enabled = animateTilesExpansion())
+ sharedElement(ElementKeys.TileElementMatcher, enabled = animateTilesExpansion())
// This will animate between 0f (QQS) and 0.5, fading in the QQS tiles when coming back
// from non first page QS. The QS content ends fading out at 0.43f, so there's a brief
// overlap, but because they are really faint, it looks better than complete black without
// overlap.
fractionRange(end = 0.5f) { fade(SceneKeys.QqsTileElementMatcher) }
- anchoredTranslate(SceneKeys.QqsTileElementMatcher, Elements.GridAnchor)
+ anchoredTranslate(SceneKeys.QqsTileElementMatcher, ElementKeys.GridAnchor)
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/GridAnchor.kt b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/GridAnchor.kt
index 76dfb4d..19ad9fc 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/GridAnchor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/GridAnchor.kt
@@ -19,7 +19,7 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.android.compose.animation.scene.ContentScope
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements
+import com.android.systemui.qs.shared.ui.ElementKeys
/**
* This composable is used at the start of the tiles in QQS and QS to anchor the expansion and be
@@ -28,5 +28,5 @@
@Composable
fun ContentScope.GridAnchor(modifier: Modifier = Modifier) {
// The size of this anchor does not matter, as the tiles don't change size on expansion.
- Element(Elements.GridAnchor, modifier) {}
+ Element(ElementKeys.GridAnchor, modifier) {}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
index fbacbca..24610b8 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/QuickQuickSettings.kt
@@ -34,7 +34,7 @@
import com.android.systemui.qs.panels.ui.compose.infinitegrid.Tile
import com.android.systemui.qs.panels.ui.viewmodel.BounceableTileViewModel
import com.android.systemui.qs.panels.ui.viewmodel.QuickQuickSettingsViewModel
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements.toElementKey
+import com.android.systemui.qs.shared.ui.ElementKeys.toElementKey
import com.android.systemui.res.R
@Composable
diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
index 96927c5..c02972d5 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/InfiniteGridLayout.kt
@@ -57,7 +57,7 @@
import com.android.systemui.qs.panels.ui.viewmodel.TextFeedbackContentViewModel
import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel
import com.android.systemui.qs.pipeline.shared.TileSpec
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements.toElementKey
+import com.android.systemui.qs.shared.ui.ElementKeys.toElementKey
import com.android.systemui.qs.ui.composable.QuickSettingsShade
import com.android.systemui.res.R
import javax.inject.Inject
diff --git a/packages/SystemUI/src/com/android/systemui/qs/shared/ui/ElementKeys.kt b/packages/SystemUI/src/com/android/systemui/qs/shared/ui/ElementKeys.kt
new file mode 100644
index 0000000..181a145
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/qs/shared/ui/ElementKeys.kt
@@ -0,0 +1,33 @@
+/*
+ * 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.qs.shared.ui
+
+import com.android.compose.animation.scene.ElementKey
+import com.android.systemui.qs.pipeline.shared.TileSpec
+
+/** Element keys to be used by the compose implementation of QS for animations. */
+object ElementKeys {
+ val QuickSettingsContent = ElementKey("QuickSettingsContent")
+ val GridAnchor = ElementKey("QuickSettingsGridAnchor")
+ val FooterActions = ElementKey("FooterActions")
+
+ fun TileSpec.toElementKey() = ElementKey(this.spec, TileIdentity(this))
+
+ val TileElementMatcher = ElementKey.withIdentity { it is TileIdentity }
+}
+
+private data class TileIdentity(val spec: TileSpec)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/shared/ui/QuickSettings.kt b/packages/SystemUI/src/com/android/systemui/qs/shared/ui/QuickSettings.kt
deleted file mode 100644
index f242a4e..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/shared/ui/QuickSettings.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.qs.shared.ui
-
-import com.android.compose.animation.scene.ElementKey
-import com.android.compose.animation.scene.ValueKey
-import com.android.systemui.qs.pipeline.shared.TileSpec
-
-object QuickSettings {
- /** Element keys to be used by the compose implementation of QS for animations. */
- object Elements {
- val QuickSettingsContent = ElementKey("QuickSettingsContent")
- val GridAnchor = ElementKey("QuickSettingsGridAnchor")
- val FooterActions = ElementKey("QuickSettingsFooterActions")
-
- fun TileSpec.toElementKey() = ElementKey(this.spec, TileIdentity(this))
-
- val TileElementMatcher = ElementKey.withIdentity { it is TileIdentity }
-
- val QuickQuickSettings = ElementKey("QuickQuickSettings")
- val SplitShadeQuickSettings = ElementKey("SplitShadeQuickSettings")
- }
-
- object SharedValues {
- val TilesSquishiness = ValueKey("QuickSettingsTileSquishiness")
-
- object SquishinessValues {
- val Default = 1f
- val LockscreenSceneStarting = 0f
- val GoneSceneStarting = 0.3f
- }
- }
-}
-
-private data class TileIdentity(val spec: TileSpec)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/ui/compose/TileBounceMotionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/ui/compose/TileBounceMotionTest.kt
index 5d3b489..fa40fff 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/panels/ui/compose/TileBounceMotionTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/panels/ui/compose/TileBounceMotionTest.kt
@@ -46,7 +46,7 @@
import com.android.systemui.qs.panels.ui.viewmodel.BounceableTileViewModel
import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel
import com.android.systemui.qs.pipeline.shared.TileSpec
-import com.android.systemui.qs.shared.ui.QuickSettings.Elements.toElementKey
+import com.android.systemui.qs.shared.ui.ElementKeys.toElementKey
import com.android.systemui.res.R
import com.android.systemui.testKosmos
import kotlin.time.Duration.Companion.milliseconds
