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

Commit 6f8e02c7 authored by Achim Thesmann's avatar Achim Thesmann Committed by Automerger Merge Worker
Browse files

Merge "Opt in SysUI code to allow BAL" into udc-dev am: 863329a8 

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



Change-Id: Ia8a773aa620ad1bb7b2d0eb34c2bed5bfbd8fc33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 466e9ee6 863329a8

packages/SystemUI/src/com/android/systemui/controls/ui/DetailDialog.kt

+5 −1
Original line number Diff line number Diff line
@@ -162,7 +162,11 @@ class DetailDialog( 
                    broadcastSender.closeSystemDialogs()

                    // not sent as interactive, lest the higher-importance activity launch

                    // be impacted

                    pendingIntent.send()

                    val options = ActivityOptions.makeBasic()

                            .setPendingIntentBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                            .toBundle()

                    pendingIntent.send(options)

                    false

                }

                if (keyguardStateController.isUnlocked()) {

packages/SystemUI/src/com/android/systemui/controls/ui/StatusBehavior.kt

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.controls.ui



import android.app.ActivityOptions

import android.app.AlertDialog

import android.app.PendingIntent

import android.content.DialogInterface
@@ -74,7 +75,11 @@ class StatusBehavior : Behavior { 
                R.string.controls_open_app,

                DialogInterface.OnClickListener { dialog, _ ->

                    try {

                        cws.control?.getAppIntent()?.send()

                        val options = ActivityOptions.makeBasic()

                                .setPendingIntentBackgroundActivityStartMode(

                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                                .toBundle()

                        cws.control?.getAppIntent()?.send(options)

                        context.sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))

                    } catch (e: PendingIntent.CanceledException) {

                        cvh.setErrorStatus()

packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt

+6 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.systemui.smartspace.dagger



import android.app.ActivityOptions

import android.app.PendingIntent

import android.content.Intent

import android.view.View
@@ -81,7 +82,11 @@ interface SmartspaceViewComponent { 
                        showOnLockscreen: Boolean

                ) {

                    if (showOnLockscreen) {

                        pi.send()

                        val options = ActivityOptions.makeBasic()

                                .setPendingIntentBackgroundActivityStartMode(

                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                                .toBundle()

                        pi.send(options)

                    } else {

                        activityStarter.startPendingIntentDismissingKeyguard(pi)

                    }

packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt

+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.lockscreen



import android.app.ActivityOptions

import android.app.PendingIntent

import android.app.smartspace.SmartspaceConfig

import android.app.smartspace.SmartspaceManager
@@ -358,7 +359,11 @@ constructor( 
                    showOnLockscreen: Boolean

            ) {

                if (showOnLockscreen) {

                    pi.send()

                    val options = ActivityOptions.makeBasic()

                            .setPendingIntentBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                            .toBundle()

                    pi.send(options)

                } else {

                    activityStarter.postStartActivityDismissingKeyguard(pi)

                }

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterImpl.kt

+3 −0
Original line number Diff line number Diff line
@@ -572,6 +572,9 @@ constructor( 
                                    // TODO b/221255671: restrict this to only be set for

                                    // notifications

                                    options.isEligibleForLegacyPermissionPrompt = true

                                    options.setPendingIntentBackgroundActivityStartMode(

                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED

                                    )

                                    return intent.sendAndReturnResult(

                                        null,

                                        0,