From 756d819c4216f506ae0820bd3e1dff2ea53509ed Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Mon, 20 Jan 2020 14:18:15 +0800
Subject: [PATCH] Color correction improvement (5/n)

"Use Color correction" should be replaced by "Correct colors"

Bug: 145968068
Bug: 147988288
Test: make RunSettingsRoboTests2
Change-Id: I90ef36a99b34a82eb9f29f8b79d9aaa8d56441d1
---
 res/values/strings.xml                                      | 2 +-
 .../ToggleColorInversionPreferenceFragment.java             | 6 ++----
 .../accessibility/ToggleDaltonizerPreferenceFragment.java   | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 330ada4b4f7..9a754debb20 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4948,7 +4948,7 @@
     <!-- Used in the accessibility service settings to control turning on/off the service entirely -->
     <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
+    <string name="accessibility_daltonizer_master_switch_title">Correct colors</string>
     <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->
     <string name="accessibility_caption_master_switch_title">Show captions</string>
     <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ca3223984e4..fc0b85f54f1 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -105,10 +105,8 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
 
     @Override
     protected void updateSwitchBarText(SwitchBar switchBar) {
-        final String switchBarText = getString(
-                R.string.accessibility_display_inversion_switch_title,
-                getString(R.string.accessibility_display_inversion_switch_title));
-        switchBar.setSwitchBarText(switchBarText, switchBarText);
+        switchBar.setSwitchBarText(R.string.accessibility_display_inversion_switch_title,
+                R.string.accessibility_display_inversion_switch_title);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 3016f6ab38f..8d2e57831cb 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -325,9 +325,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
 
     @Override
     protected void updateSwitchBarText(SwitchBar switchBar) {
-        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,
-                getString(R.string.accessibility_display_daltonizer_preference_title));
-        switchBar.setSwitchBarText(switchBarText, switchBarText);
+        switchBar.setSwitchBarText(R.string.accessibility_daltonizer_master_switch_title,
+                R.string.accessibility_daltonizer_master_switch_title);
     }
 
     @Override