PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "After rotating the screen, lost the progress bar dialog state" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-04-10 09:43:51 +00:00
committed by Android (Google) Code Review
parent 736377d5e2 77c89803ee
commit a3d8978f85
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/network/SimOnboardingActivity.kt
View File

@@ -43,6 +43,7 @@ import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -177,11 +178,11 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
override fun Content() { override fun Content() {
showStartingDialog = remember { mutableStateOf(false) } showStartingDialog = rememberSaveable { mutableStateOf(false) }
showError = remember { mutableStateOf(ErrorType.ERROR_NONE) } showError = rememberSaveable { mutableStateOf(ErrorType.ERROR_NONE) }
showProgressDialog = remember { mutableStateOf(false) } showProgressDialog = rememberSaveable { mutableStateOf(false) }
showDsdsProgressDialog = remember { mutableStateOf(false) } showDsdsProgressDialog = rememberSaveable { mutableStateOf(false) }
showRestartDialog = remember { mutableStateOf(false) } showRestartDialog = rememberSaveable { mutableStateOf(false) }
scope = rememberCoroutineScope() scope = rememberCoroutineScope()
registerSidecarReceiverFlow() registerSidecarReceiverFlow()
@@ -189,7 +190,16 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
ErrorDialogImpl() ErrorDialogImpl()
RestartDialogImpl() RestartDialogImpl()
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
if (onboardingService.activeSubInfoList.isNotEmpty()) { if (showError.value != ErrorType.ERROR_NONE
|| showProgressDialog.value
|| showDsdsProgressDialog.value
|| showRestartDialog.value) {
Log.d(TAG, "status: showError:${showError.value}, " +
"showProgressDialog:${showProgressDialog.value}, " +
"showDsdsProgressDialog:${showDsdsProgressDialog.value}, " +
"showRestartDialog:${showRestartDialog.value}")
showStartingDialog.value = false
} else if (onboardingService.activeSubInfoList.isNotEmpty()) {
showStartingDialog.value = true showStartingDialog.value = true
} }
} }