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

Commit 78a04abb authored Dec 22, 2022 by Alejandro Nijamkin

Beautifies picker disabled dialogs (1/2).

Makes the dialog look like its spec.

Fix: 262773261
Test: Manually verified that the dialog looks like the spec
Change-Id: Ib48a9c1ac62220c573d35e43c39ea33d7a0ec04e

parent 21ce858e

packages/SystemUI/customization/src/com/android/systemui/shared/quickaffordance/data/content/KeyguardQuickAffordanceProviderContract.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -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"
		/**

packages/SystemUI/res/values/strings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -2706,12 +2706,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

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -80,10 +80,6 @@ constructor(
		return KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(
		instructions =
		listOf(
		context.getString(
		R.string.keyguard_affordance_enablement_dialog_message,
		pickerName,
		),
		context.getString(
		R.string.keyguard_affordance_enablement_dialog_home_instruction_1
		),

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -83,10 +83,6 @@ constructor(
		KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(
		instructions =
		listOf(
		context.getString(
		R.string.keyguard_affordance_enablement_dialog_message,
		pickerName,
		),
		context.getString(
		R.string
		.keyguard_affordance_enablement_dialog_qr_scanner_instruction

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -117,10 +117,6 @@ constructor(
		KeyguardQuickAffordanceConfig.PickerScreenState.Disabled(
		instructions =
		listOf(
		context.getString(
		R.string.keyguard_affordance_enablement_dialog_message,
		pickerName,
		),
		context.getString(
		R.string.keyguard_affordance_enablement_dialog_wallet_instruction_1
		),