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

Merge "Remove ability for user to open wallet directly within shortcuts disabled dialog" into udc-dev am: ed2f66c600

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

Change-Id: Ibcee0526018bd1e87e51ccde0c750fb571e3e88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Hinegardner
2023-05-26 18:53:28 +00:00
committed by Automerger Merge Worker
parent c677fb387e ed2f66c600
commit 37afcf784f
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt
View File

@@ -18,7 +18,6 @@
package com.android.systemui.keyguard.data.quickaffordance package com.android.systemui.keyguard.data.quickaffordance
import android.content.Context import android.content.Context
import android.content.Intent
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.service.quickaccesswallet.GetWalletCardsError import android.service.quickaccesswallet.GetWalletCardsError
import android.service.quickaccesswallet.GetWalletCardsResponse import android.service.quickaccesswallet.GetWalletCardsResponse
@@ -33,7 +32,6 @@ import com.android.systemui.common.shared.model.ContentDescription
import com.android.systemui.common.shared.model.Icon import com.android.systemui.common.shared.model.Icon
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.keyguard.data.quickaffordance.KeyguardQuickAffordanceConfig.Companion.componentName
import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.wallet.controller.QuickAccessWalletController import com.android.systemui.wallet.controller.QuickAccessWalletController
import javax.inject.Inject import javax.inject.Inject
@@ -103,17 +101,6 @@ constructor(
!walletController.walletClient.isWalletServiceAvailable -> !walletController.walletClient.isWalletServiceAvailable ->
KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice KeyguardQuickAffordanceConfig.PickerScreenState.UnavailableOnDevice
!walletController.isWalletEnabled || queryCards().isEmpty() -> { !walletController.isWalletEnabled || queryCards().isEmpty() -> {
val componentName =
walletController.walletClient.createWalletSettingsIntent().toComponentName()
val actionText =
if (componentName != null) {
context.getString(
R.string.keyguard_affordance_enablement_dialog_action_template,
pickerName,
)
} else {
null
}
KeyguardQuickAffordanceConfig.PickerScreenState.Disabled( KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(
instructions = instructions =
listOf( listOf(
@@ -124,8 +111,6 @@ constructor(
R.string.keyguard_affordance_enablement_dialog_wallet_instruction_2 R.string.keyguard_affordance_enablement_dialog_wallet_instruction_2
), ),
), ),
actionText = actionText,
actionComponentName = componentName,
) )
} }
else -> KeyguardQuickAffordanceConfig.PickerScreenState.Default() else -> KeyguardQuickAffordanceConfig.PickerScreenState.Default()
@@ -182,14 +167,6 @@ constructor(
} }
} }
private fun Intent?.toComponentName(): String? {
if (this == null) {
return null
}
return componentName(packageName = `package`, action = action)
}
companion object { companion object {
private const val TAG = "QuickAccessWalletKeyguardQuickAffordanceConfig" private const val TAG = "QuickAccessWalletKeyguardQuickAffordanceConfig"
} }