Fix percentage formatting throughout Settings.
Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5305881..4c4beaa 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1590,12 +1590,12 @@
<string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="4925678997049911808">"الوقت المتبقي: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> للشحن"</string>
- <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تبقى <xliff:g id="TIME">%2$s</xliff:g> تقريبًا"</string>
- <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="STATE">%2$s</xliff:g>"</string>
- <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال"</string>
- <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر التيار المتردد"</string>
- <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر USB"</string>
- <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر الاتصال اللاسلكي"</string>
+ <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$s</xliff:g> - تبقى <xliff:g id="TIME">%2$s</xliff:g> تقريبًا"</string>
+ <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
+ <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال"</string>
+ <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر التيار المتردد"</string>
+ <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر USB"</string>
+ <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال عبر الاتصال اللاسلكي"</string>
<string name="power_usage_list_summary" msgid="2409288197839512482">"الاستخدام منذ آخر شحن كامل"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
<string name="battery_since_reset" msgid="7464546661121187045">"استخدام البطارية منذ إعادة التعيين"</string>
@@ -1612,7 +1612,6 @@
<string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"وقت تشغيل Wi-Fi"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"وقت تشغيل Wi-Fi"</string>
- <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
<string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
<string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
@@ -1684,7 +1683,7 @@
<string name="battery_saver" msgid="1426682272004907982">"موفِّر طاقة البطارية"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"التشغيل تلقائيًا"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"أبدًا"</string>
- <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"على مستوى %1$d%% من البطارية"</string>
+ <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"على مستوى %1$s من البطارية"</string>
<string name="process_stats_summary_title" msgid="1144688045609771677">"إحصائيات العمليات"</string>
<string name="process_stats_summary" msgid="109387941605607762">"الإحصائيات التقنية حول العمليات الجارية"</string>
<string name="app_memory_use" msgid="7849258480392171939">"استخدام الذاكرة"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c720c8d..e1d7da9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1590,12 +1590,12 @@
<string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
- <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
- <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$d</xliff:g>٪ - <xliff:g id="STATE">%2$s</xliff:g>"</string>
- <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string>
- <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق AC"</string>
- <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق USB"</string>
- <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$d</xliff:g>%% - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل به صورت بیسیم"</string>
+ <string name="power_discharging_duration" msgid="7125493014448497620">"<xliff:g id="LEVEL">%1$s</xliff:g> - تقریباً <xliff:g id="TIME">%2$s</xliff:g> مانده است"</string>
+ <string name="power_charging" msgid="712751285832976915">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string>
+ <string name="power_charging_duration" msgid="4802183864773082009">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل"</string>
+ <string name="power_charging_duration_ac" msgid="3611179931297824699">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق AC"</string>
+ <string name="power_charging_duration_usb" msgid="1106605348913397583">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل از طریق USB"</string>
+ <string name="power_charging_duration_wireless" msgid="633606920144617227">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> مانده تا شارژ کامل به صورت بیسیم"</string>
<string name="power_usage_list_summary" msgid="2409288197839512482">"استفاده از زمان آخرین شارژ کامل"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
<string name="battery_since_reset" msgid="7464546661121187045">"استفاده از باتری از زمان بازنشانی"</string>
@@ -1612,7 +1612,6 @@
<string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi به موقع"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi به موقع"</string>
- <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
<string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
<string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
@@ -1684,7 +1683,7 @@
<string name="battery_saver" msgid="1426682272004907982">"ذخیره کننده باتری"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"روشن شدن خودکار"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"هرگز"</string>
- <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"در %1$d%% باتری"</string>
+ <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"در %1$s باتری"</string>
<string name="process_stats_summary_title" msgid="1144688045609771677">"آمار فرآیند"</string>
<string name="process_stats_summary" msgid="109387941605607762">"آمار دقیق برای فرآیندهای در حال اجرا"</string>
<string name="app_memory_use" msgid="7849258480392171939">"استفاده از حافظه"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e38ed39..b4917e3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3794,22 +3794,22 @@
<!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
<string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
- <string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
+ <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g>
- approx. <xliff:g id="time">%2$s</xliff:g> left</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
- <string name="power_charging"><xliff:g id="level">%1$d</xliff:g>%% -
+ <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="state">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
- <string name="power_charging_duration"><xliff:g id="level">%1$d</xliff:g>%% -
+ <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
- <string name="power_charging_duration_ac"><xliff:g id="level">%1$d</xliff:g>%% -
+ <string name="power_charging_duration_ac"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full on AC</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
- <string name="power_charging_duration_usb"><xliff:g id="level">%1$d</xliff:g>%% -
+ <string name="power_charging_duration_usb"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full over USB</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
- <string name="power_charging_duration_wireless"><xliff:g id="level">%1$d</xliff:g>%% -
+ <string name="power_charging_duration_wireless"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full from wireless</string>
<!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
<string name="power_usage_list_summary">Use since last full charge</string>
@@ -3841,9 +3841,6 @@
<string name="wifi_on_time">Wi\u2011Fi on time</string>
<!-- Bluetooth on time -->
<string name="bluetooth_on_time">Wi\u2011Fi on time</string>
- <!-- Application name and battery usage percentage -->
- <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
- <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
<!-- Activity title for battery usage history details -->
<string name="history_details_title">History details</string>
@@ -4011,7 +4008,7 @@
<string name="battery_saver_turn_on_automatically_never">Never</string>
<!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
- <string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
+ <string name="battery_saver_turn_on_automatically_pct">at %1$s battery</string>
<!-- Process Stats strings -->
<skip />
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a46df0a..6c9391d 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -335,8 +335,7 @@
/** Formats a double from 0.0..1.0 as a percentage. */
private static String formatPercentage(double percentage) {
- BidiFormatter bf = BidiFormatter.getInstance();
- return bf.unicodeWrap(NumberFormat.getPercentInstance().format(percentage));
+ return NumberFormat.getPercentInstance().format(percentage);
}
public static boolean isBatteryPresent(Intent batteryChangedIntent) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index fbd0ea3..11e821a 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -494,6 +494,7 @@
mMinPercentLabelString = Utils.formatPercentage(0);
mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
+ String batteryPercentString = Utils.formatPercentage(mBatteryLevel);
long remainingTimeUs = 0;
mDischarging = true;
if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
@@ -503,9 +504,9 @@
String timeString = Formatter.formatShortElapsedTime(getContext(),
drainTime / 1000);
mChargeLabelString = getContext().getResources().getString(
- R.string.power_discharging_duration, mBatteryLevel, timeString);
+ R.string.power_discharging_duration, batteryPercentString, timeString);
} else {
- mChargeLabelString = Utils.formatPercentage(mBatteryLevel);
+ mChargeLabelString = batteryPercentString;
}
} else {
final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
@@ -530,10 +531,10 @@
resId = R.string.power_charging_duration;
}
mChargeLabelString = getContext().getResources().getString(
- resId, mBatteryLevel, timeString);
+ resId, batteryPercentString, timeString);
} else {
mChargeLabelString = getContext().getResources().getString(
- R.string.power_charging, mBatteryLevel, statusLabel);
+ R.string.power_charging, batteryPercentString, statusLabel);
}
}
mDrainString = "";
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index bd989d0..94620cc 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -37,6 +37,7 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
import com.android.settings.notification.SettingPref;
import com.android.settings.widget.SwitchBar;
@@ -78,7 +79,8 @@
@Override
protected String getCaption(Resources res, int value) {
if (value > 0 && value < 100) {
- return res.getString(R.string.battery_saver_turn_on_automatically_pct, value);
+ return res.getString(R.string.battery_saver_turn_on_automatically_pct,
+ Utils.formatPercentage(value));
}
return res.getString(R.string.battery_saver_turn_on_automatically_never);
}