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

Commit fd388293 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Add resId to ComposeView in QSFragmentCompose" into main

parents 9471729a 92348ba7
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -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())