Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix pager state after configuration change" into udc-dev am: ee760d7e2b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23181938

Change-Id: I0c5ba88d1b0585c6a82515233f2e18872f01b734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-05-12 09:14:42 +00:00
committed by Automerger Merge Worker
parent d00b288c52 ee760d7e2b
commit 0b9d678394
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsPager.kt
View File

@@ -20,12 +20,21 @@ import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.pager.PagerState
import androidx.compose.material3.TabRow
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.State
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
import com.android.settingslib.spa.framework.theme.SettingsDimension
import kotlin.math.absoluteValue
import kotlinx.coroutines.launch
@@ -41,7 +50,7 @@ fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit
Column {
val coroutineScope = rememberCoroutineScope()
val pagerState = rememberPagerState()
val pagerState by rememberPageStateFixed()
TabRow(
selectedTabIndex = pagerState.currentPage,
@@ -69,3 +78,28 @@ fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit
}
}
}
/**
* Gets the state of [PagerState].
*
* This is a work around.
*
* TODO: Remove this and replace with rememberPageState() after the Compose Foundation 1.5.0-alpha04
* updated in the platform.
*/
@Composable
@OptIn(ExperimentalFoundationApi::class)
private fun rememberPageStateFixed(): State<PagerState> {
var currentPage by rememberSaveable { mutableStateOf(0) }
val pagerStateHolder = remember { mutableStateOf(PagerState(currentPage)) }
LaunchedEffect(LocalConfiguration.current.orientation) {
// Reset pager state to fix an issue after configuration change.
// When we declare android:configChanges="orientation" in the manifest, the pager state is
// in a weird state after configuration change.
pagerStateHolder.value = PagerState(currentPage)
}
SideEffect {
currentPage = pagerStateHolder.value.currentPage
}
return pagerStateHolder
}