From c8e077368fef685b9f1a5baba3c41989c144cdce Mon Sep 17 00:00:00 2001
From: Wesley Wang <wesleycwwang@google.com>
Date: Thu, 6 Oct 2022 18:17:03 +0800
Subject: [PATCH] Fix battery saver number format issue

 - The summary of battery saver scheduler use util to convert the number
   but saver sticky preference use another way to convert it, update
   them to use the same convert method

Bug: 250684701
Test: make SettingsRoboTests
Change-Id: I4f188a2e8e9d4810d187b870e331dc84f50b2b6f
---
 res/values/strings.xml                                      | 6 +++---
 .../BatterySaverStickyPreferenceController.java             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31fac514858..3c79253141b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5482,11 +5482,11 @@
     <string name="battery_saver_sticky_title_new">Turn off when charged</string>
 
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>
 
     <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->
     <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
index ce2cbb0b548..d11a87628a6 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
@@ -1,7 +1,6 @@
 package com.android.settings.fuelgauge.batterysaver;
 
 import android.content.Context;
-import android.icu.text.NumberFormat;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.text.TextUtils;
@@ -10,6 +9,7 @@ import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.TogglePreferenceController;
 
@@ -44,7 +44,7 @@ public class BatterySaverStickyPreferenceController extends TogglePreferenceCont
             mContext.getContentResolver(), Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_LEVEL, 90);
         preference.setSummary(TextUtils.expandTemplate(
                 mContext.getString(R.string.battery_saver_sticky_description_new),
-                NumberFormat.getIntegerInstance().format(stickyShutoffLevel)));
+                Utils.formatPercentage(stickyShutoffLevel)));
     }
 
     @Override