From 8ce68baa24f60cd21e9313da3cb461424534eaee Mon Sep 17 00:00:00 2001
From: mxyyiyi <mxyyiyi@google.com>
Date: Wed, 20 Mar 2024 13:42:57 +0800
Subject: [PATCH] Update percentage symbol from western sign to arabic sign

(https://screenshot.googleplex.com/ALgEzpDKG4BMBB4)

Fix: 322855881
Test: manual
Change-Id: I1335996814a1b80006481f52201a107144497859
---
 res/values/strings.xml                                      | 3 ---
 .../fuelgauge/BatteryHeaderPreferenceController.java        | 6 +-----
 .../fuelgauge/BatteryHeaderPreferenceControllerTest.java    | 6 +-----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index dd51f522b1f..66acfaa2853 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5814,9 +5814,6 @@
       other   {# apps restricted}
     }</string>
 
-    <!-- Title to display the battery percentage. [CHAR LIMIT=24] -->
-    <string name="battery_header_title_alternate"><xliff:g id="number" example="88">^1</xliff:g><small> <font size="20"><xliff:g id="unit" example="%">%</xliff:g></font></small></string>
-
     <!-- Summary for top level battery tile if battery is not present. [CHAR LIMIT=NONE] -->
     <string name="battery_missing_message">Problem reading the battery meter.</string>
     <!-- Help text if battery is not present. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 6a65dc07c88..907c89faec0 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -17,10 +17,8 @@ package com.android.settings.fuelgauge;
 
 import android.content.Context;
 import android.content.Intent;
-import android.icu.text.NumberFormat;
 import android.os.BatteryManager;
 import android.os.PowerManager;
-import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -145,8 +143,6 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
     }
 
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
-        return TextUtils.expandTemplate(
-                mContext.getText(R.string.battery_header_title_alternate),
-                NumberFormat.getIntegerInstance().format(batteryLevel));
+        return com.android.settings.Utils.formatPercentage(batteryLevel);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 1df8a406b69..9457f99a42d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -28,10 +28,8 @@ import android.content.Intent;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
-import android.icu.text.NumberFormat;
 import android.os.BatteryManager;
 import android.os.PowerManager;
-import android.text.TextUtils;
 
 import androidx.preference.PreferenceScreen;
 
@@ -320,9 +318,7 @@ public class BatteryHeaderPreferenceControllerTest {
     }
 
     private CharSequence formatBatteryPercentageText() {
-        return TextUtils.expandTemplate(
-                mContext.getText(R.string.battery_header_title_alternate),
-                NumberFormat.getIntegerInstance().format(BATTERY_LEVEL));
+        return com.android.settings.Utils.formatPercentage(BATTERY_LEVEL);
     }
 
     private void setChargingState(boolean isDischarging, boolean updatedByStatusFeature) {