From 698458c5cd64515ec9c0b26adbbdf5b06b52fdb2 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Sun, 19 Nov 2023 21:57:19 +0000
Subject: [PATCH] Update strings for stopping accessibility services

Flag: EXEMPT
Flag exempt reason: low risk changes. Mostly text changes

Test: manual - turn on Talkback and turn off Talkback and see the dialog
Test: atest ToggleAccessibilityServicePreferenceFragmentTest
Bug: 286549065
Change-Id: I90869b5fca0500739f65d0b0ef3331cb728be685
---
 res/values/strings.xml                                   | 9 +++------
 .../accessibility/AccessibilityServiceWarning.java       | 3 ---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52be658a2ad..575aaecb57d 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 9022ebfa9a1..fb50ef15cd6 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -139,9 +139,6 @@ public class AccessibilityServiceWarning {
 
         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)