From 6f650b11fb2e03d65e005156bc939895e595ed6e Mon Sep 17 00:00:00 2001
From: "Wesley.CW Wang" <wesleycwwang@google.com>
Date: Fri, 4 Jun 2021 03:08:49 +0800
Subject: [PATCH] Update string reference

Bug: 189842579
Bug: 189899895
Test: make RunSettingsRoboTests
Change-Id: I545f85226fcd184aa7e2af84734943173a869693
---
 res/values/strings.xml                                       | 2 ++
 res/xml/power_usage_detail.xml                               | 2 +-
 .../fuelgauge/batterysaver/BatterySaverSettings.java         | 5 -----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ae11ac259ed..89b1292e490 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5984,6 +5984,8 @@
     <string name="manager_battery_usage_unrestricted_title">Unrestricted</string>
     <!-- Title for the battery optimized settings [CHAR_LIMIT=40] -->
     <string name="manager_battery_usage_optimized_title">Optimized</string>
+    <!-- Title for the battery restricted settings [CHAR_LIMIT=40] -->
+    <string name="manager_battery_usage_restricted_title">Restricted</string>
     <!-- Summary for the battery unrestricted settings [CHAR_LIMIT=NONE] -->
     <string name="manager_battery_usage_unrestricted_summary">Allow battery usage in background without restrictions. May use more battery.</string>
     <!-- Summary for the battery optimized settings [CHAR_LIMIT=NONE] -->
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 3481c1ef4b5..f383284e87b 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -45,7 +45,7 @@
         <com.android.settingslib.widget.RadioButtonPreference
             android:key="restricted_pref"
             android:summary="@string/manager_battery_usage_restricted_summary"
-            android:title="@string/restricted_true_label"
+            android:title="@string/manager_battery_usage_restricted_title"
             settings:controller="com.android.settings.fuelgauge.RestrictedPreferenceController"/>
 
     </PreferenceCategory>
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index 676ed20e35a..3943ac570b7 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge.batterysaver;
 
 import android.app.settings.SettingsEnums;
-import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
@@ -36,7 +35,6 @@ import com.android.settingslib.widget.FooterPreference;
 public class BatterySaverSettings extends DashboardFragment {
     private static final String TAG = "BatterySaverSettings";
     private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference";
-    private SpannableStringBuilder mFooterText;
     private String mHelpUri;
 
     @Override
@@ -76,8 +74,6 @@ public class BatterySaverSettings extends DashboardFragment {
     void setupFooter() {
         mHelpUri = getString(R.string.help_url_battery_saver_settings);
         if (!TextUtils.isEmpty(mHelpUri)) {
-            mFooterText = new SpannableStringBuilder(getText(
-                    com.android.internal.R.string.battery_saver_description_with_learn_more));
             addHelpLink();
         }
     }
@@ -87,7 +83,6 @@ public class BatterySaverSettings extends DashboardFragment {
     void addHelpLink() {
         FooterPreference pref = getPreferenceScreen().findPreference(KEY_FOOTER_PREFERENCE);
         if (pref != null) {
-            pref.setTitle(mFooterText);
             pref.setSelectable(false);
             pref.setLearnMoreAction(v -> {
                 mMetricsFeatureProvider.action(getContext(),