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

Allow launch activity from background for PendingIntent

Browse Source 
BUG: 343317785
Test: local test
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I22c430c0d3879f034f3a491471781aa9b49a02f2
This commit is contained in:
Haijie Hong
2024-10-31 16:16:45 +08:00
parent 75e2dc4b21
commit 6852925676
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
View File

@@ -16,6 +16,7 @@
package com.android.settings.bluetooth.ui.view package com.android.settings.bluetooth.ui.view
import android.app.ActivityOptions
import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothAdapter
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@@ -206,25 +207,21 @@ class DeviceDetailsFragmentFormatterImpl(
.collectAsStateWithLifecycle(initialValue = false) .collectAsStateWithLifecycle(initialValue = false)
val settings = contents val settings = contents
AnimatedVisibility( AnimatedVisibility(visible = settings.isNotEmpty(), enter = fadeIn(), exit = fadeOut()) {
visible = settings.isNotEmpty(),
enter = fadeIn(),
exit = fadeOut(),
) {
Box { Box {
Box( Box(
modifier = modifier =
Modifier.matchParentSize() Modifier.matchParentSize()
.padding(16.dp, 0.dp, 8.dp, 0.dp) .padding(16.dp, 0.dp, 8.dp, 0.dp)
.background( .background(
color = color =
if (highlighted) { if (highlighted) {
MaterialTheme.colorScheme.primaryContainer MaterialTheme.colorScheme.primaryContainer
} else { } else {
Color.Transparent Color.Transparent
}, },
shape = RoundedCornerShape(28.dp), shape = RoundedCornerShape(28.dp),
), )
) {} ) {}
buildPreferences(settings) buildPreferences(settings)
} }
@@ -257,17 +254,11 @@ class DeviceDetailsFragmentFormatterImpl(
} }
} }
else -> { else -> {
if ( if (!settings.all { it is DeviceSettingPreferenceModel.MultiTogglePreference }) {
!settings.all {
it is DeviceSettingPreferenceModel.MultiTogglePreference
}
) {
return return
} }
buildMultiTogglePreference( buildMultiTogglePreference(
settings.filterIsInstance< settings.filterIsInstance<DeviceSettingPreferenceModel.MultiTogglePreference>()
DeviceSettingPreferenceModel.MultiTogglePreference
>()
) )
} }
} }
@@ -375,7 +366,12 @@ class DeviceDetailsFragmentFormatterImpl(
context.startActivity(action.intent) context.startActivity(action.intent)
} }
is DeviceSettingActionModel.PendingIntentAction -> { is DeviceSettingActionModel.PendingIntentAction -> {
action.pendingIntent.send() val options =
ActivityOptions.makeBasic()
.setPendingIntentBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS
)
action.pendingIntent.send(options.toBundle())
} }
} }
} }