diff options
| author | 2024-11-06 19:30:51 +0000 | |
|---|---|---|
| committer | 2024-11-06 19:30:51 +0000 | |
| commit | fd388293d79a288d402aad42ce803deb3c481a83 (patch) | |
| tree | 979514e9f287d7d4e5964b4d67e2a036395e3a9a | |
| parent | 9471729ae0b92a49cf62b2767d48407c1bc3d2ec (diff) | |
| parent | 92348ba796803b023016d95c7b1059c801e6c908 (diff) | |
Merge "Add resId to ComposeView in QSFragmentCompose" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt | 5 |
1 files changed, 1 insertions, 4 deletions
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 1bd0b246ad3f..51ff598c580b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt @@ -44,15 +44,12 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -201,6 +198,7 @@ constructor( val context = inflater.context val composeView = ComposeView(context).apply { + id = R.id.quick_settings_container repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.CREATED) { setViewTreeOnBackPressedDispatcherOwner( @@ -245,7 +243,6 @@ constructor( visible = viewModel.isQsVisible, modifier = Modifier.graphicsLayer { alpha = viewModel.viewAlpha } - .windowInsetsPadding(WindowInsets.navigationBars) // Clipping before translation to match QSContainerImpl.onDraw .offset { IntOffset(x = 0, y = viewModel.viewTranslationY.fastRoundToInt()) |