diff options
5 files changed, 1 insertions, 20 deletions
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt index e197752f2d3c..9491816243bf 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt @@ -84,8 +84,7 @@ object KeyguardQuickAffordanceProviderContract { const val IS_ENABLED = "is_enabled" /** * String. List of strings, delimited by [ENABLEMENT_INSTRUCTIONS_DELIMITER] to be shown - * to the user if the affordance is disabled and the user selects the affordance. The - * first one is a title while the rest are the steps needed to re-enable the affordance. + * to the user if the affordance is disabled and the user selects the affordance. */ const val ENABLEMENT_INSTRUCTIONS = "enablement_instructions" /** diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 2eb58b9c98ec..a08cd7b7ef4c 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2826,12 +2826,6 @@ <string name="keyguard_affordance_enablement_dialog_action_template">Open <xliff:g id="appName" example="Wallet">%1$s</xliff:g></string> <!-- - Template for a message shown right before a list of instructions that tell the user what to do - in order to enable a shortcut to a specific app. [CHAR LIMIT=NONE] - --> - <string name="keyguard_affordance_enablement_dialog_message">To add the <xliff:g id="appName" example="Wallet">%1$s</xliff:g> app as a shortcut, make sure</string> - - <!-- Requirement for the wallet app to be available for the user to use. This is shown as part of a bulleted list of requirements. When all requirements are met, the app can be accessed through a shortcut button on the lock screen. [CHAR LIMIT=NONE]. diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt index 394426df5552..09e5ec0065f8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt @@ -81,10 +81,6 @@ constructor( instructions = listOf( context.getString( - R.string.keyguard_affordance_enablement_dialog_message, - pickerName, - ), - context.getString( R.string.keyguard_affordance_enablement_dialog_home_instruction_1 ), context.getString( diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt index a96ce77ee15c..4f7990ff0deb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QrCodeScannerKeyguardQuickAffordanceConfig.kt @@ -84,10 +84,6 @@ constructor( instructions = listOf( context.getString( - R.string.keyguard_affordance_enablement_dialog_message, - pickerName, - ), - context.getString( R.string .keyguard_affordance_enablement_dialog_qr_scanner_instruction ), diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt index beb20ce4540c..1928f40fa059 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt @@ -118,10 +118,6 @@ constructor( instructions = listOf( context.getString( - R.string.keyguard_affordance_enablement_dialog_message, - pickerName, - ), - context.getString( R.string.keyguard_affordance_enablement_dialog_wallet_instruction_1 ), context.getString( |