Merge "Update strings for stopping accessibility services" into main
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52be658..575aaec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5269,15 +5269,12 @@
<string name="accessibility_dialog_button_deny">Deny</string>
<!-- String for the allow button in accessibility permission dialog. [CHAR LIMIT=10] -->
- <string name="accessibility_dialog_button_stop">Stop</string>
+ <string name="accessibility_dialog_button_stop">Turn off</string>
<!-- String for the deny button in accessibility permission dialog. [CHAR LIMIT=10] -->
- <string name="accessibility_dialog_button_cancel">Cancel</string>
+ <string name="accessibility_dialog_button_cancel">Keep on</string>
<!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
- <string name="disable_service_title">Stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
- <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
- <string name="disable_service_message">Tapping <xliff:g id="stop" example="Stop">%1$s</xliff:g> will
- stop <xliff:g id="service" example="TalkBack">%2$s</xliff:g>.</string>
+ <string name="disable_service_title">Turn off <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
<!-- Title for the prompt shown as a placeholder if no accessibility services are installed. [CHAR LIMIT=50] -->
<string name="accessibility_no_services_installed">No services installed</string>
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 9022ebf..fb50ef1 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -139,9 +139,6 @@
return new AlertDialog.Builder(context)
.setTitle(context.getString(R.string.disable_service_title, serviceName))
- .setMessage(context.getString(R.string.disable_service_message,
- context.getString(R.string.accessibility_dialog_button_stop),
- serviceName))
.setCancelable(true)
.setPositiveButton(R.string.accessibility_dialog_button_stop, listener)
.setNegativeButton(R.string.accessibility_dialog_button_cancel, listener)