commit 3b3187b31398e3f0dfbfbf4a62f27d733ee12311
author Abel Tesfaye <tesfaye@google.com> Wed May 26 17:26:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 26 17:26:31 2021 +0000
tree b5fe8bc16a5f817b38c2fdecb49081650f67db77
parent 265dd55235baa6fc4196b3a5d83ca1d52f86cd76
parent 0465239d4aa91359b0ae988ae936e39860fd5af8

Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index dea2bd2..9f86901 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -98,11 +98,11 @@
     <string name="font_size_make_larger_desc">Make larger</string>
 
     <!-- Auto rotate switchbar title. [CHAR_LIMIT=NONE] -->
-    <string name="auto_rotate_settings_primary_switch_title">Use Auto-Rotate</string>
+    <string name="auto_rotate_settings_primary_switch_title">Use Auto-rotate</string>
 
     <!-- Disclaimer for camera based rotate [CHAR_LIMIT=NONE] -->
     <string name="smart_rotate_text_headline">
-        Face Detection uses the front-facing camera to improve Auto-Rotate accuracy. Images are never stored or sent to Google.&lt;br>&lt;br>
+        Face Detection uses the front-facing camera to improve Auto-rotate accuracy. Images are never stored or sent to Google.&lt;br>&lt;br>
        &lt;a href="<xliff:g example="http://www.google.com" id="url">http://support.google.com/mobile?p=telephony_rtt</xliff:g>">Learn more&lt;/a>
     </string>
     <string name="font_size_preview_text_headline">Sample text</string>
@@ -11471,6 +11471,9 @@
     <!-- [CHAR LIMIT=60] Summary string for screen attention explaining why the toggle is disabled by battery saver-->
     <string name="ambient_camera_summary_battery_saver_on">Temporarily disabled due to Battery Saver</string>
 
+    <!-- [CHAR LIMIT=60] Button text for screen attention to turn off battery saver-->
+    <string name="ambient_camera_battery_saver_off">Turn off battery saver</string>
+
     <!-- [CHAR LIMIT=60] Summary string on dark theme explaining why the toggle is disabled while the setting is off-->
     <string name="dark_ui_mode_disabled_summary_dark_theme_off">Temporarily turned on due to Battery Saver</string>
 

src/com/android/settings/display/SmartAutoRotateBatterySaverController.java

diff --git a/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java b/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
index 9bb2196..d135d4b 100644
--- a/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
+++ b/src/com/android/settings/display/SmartAutoRotateBatterySaverController.java
@@ -70,7 +70,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
         ((BannerMessagePreference) mPreference)
-                .setPositiveButtonText(R.string.disable_text)
+                .setPositiveButtonText(R.string.ambient_camera_battery_saver_off)
                 .setPositiveButtonOnClickListener(v -> {
                     mPowerManager.setPowerSaveModeEnabled(false);
                 });