commit f32310a7e6589a26c4b7fbb45d935a80f13f27d9
author Peiyong Lin <lpy@google.com> Fri Jun 22 21:08:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 22 21:08:37 2018 +0000
tree 95a876e78cd7e602c9d6c42808d8f9c6751d692a
parent ce58bf2ee969adc43b44209e5a1c7d2911ff0e2b
parent 7ccb3bb4dfeb9e0e1632fb239e330283e8c6e8cd

Merge "Rename Automatic color to Adaptive color" into pi-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd2b783..117035a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2497,11 +2497,11 @@
     <string name="color_mode_option_boosted">Boosted</string>
     <!-- Display settings screen, Color mode option for "Saturated color"  [CHAR LIMIT=45] -->
     <string name="color_mode_option_saturated">Saturated</string>
-    <!-- Display settings screen, Color mode option for "Automatic color"  [CHAR LIMIT=45] -->
-    <string name="color_mode_option_automatic">Automatic</string>
+    <!-- Display settings screen, Color mode option for "Adaptive color"  [CHAR LIMIT=45] -->
+    <string name="color_mode_option_automatic">Adaptive</string>
     <!-- Display settings screen, "natural(sRGB) color" setting option summary [CHAR LIMIT=NONE] -->
     <string name="color_mode_summary_natural">Use accurate colors only</string>
-    <!-- Display settings screen, "Automatic color" setting option summary [CHAR LIMIT=NONE] -->
+    <!-- Display settings screen, "Adaptive color" setting option summary [CHAR LIMIT=NONE] -->
     <string name="color_mode_summary_automatic">Adjust between vivid and accurate colors</string>
 
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->