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

BluetoothWiFiResetPreferenceController

Browse Source 
Fix: 280864229
Test: manually rotate the screen
Test: unit test
Change-Id: I950ebae1c371ce05dd17710788eda3dc8bdfd2ca
This commit is contained in:
Chaohui Wang
2023-10-16 19:02:48 +08:00
parent f17e4138b8
commit 17f4fd5a08
7 changed files with 250 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/spa/app/ResetAppPreferences.kt
View File

@@ -16,7 +16,6 @@
package com.android.settings.spa.app
import android.os.UserHandle
import android.os.UserManager
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -37,10 +36,7 @@ fun MoreOptionsScope.ResetAppPreferences(onClick: () -> Unit) {
RestrictedMenuItem(
text = stringResource(R.string.reset_app_preferences),
restrictions = remember {
Restrictions(
userId = UserHandle.myUserId(),
keys = listOf(UserManager.DISALLOW_APPS_CONTROL),
)
Restrictions(keys = listOf(UserManager.DISALLOW_APPS_CONTROL))
},
onClick = onClick,
)

2
src/com/android/settings/spa/preference/ComposePreference.kt
View File

@@ -40,6 +40,8 @@ class ComposePreference @JvmOverloads constructor(
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
holder.isDividerAllowedAbove = false
holder.isDividerAllowedBelow = false
(holder.itemView as ComposeView).apply {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)