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

Commit fbe7fd39 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Automerger Merge Worker
Browse files

Merge "Remove ability for user to open wallet directly within shortcuts... 

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

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



Change-Id: I2b714d91ef314f862a93756e24fca74693028ffa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f18fce66 ed2f66c6

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

+0 −23
Original line number Original line Diff line number Diff line
@@ -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"

    }

    }