From 88d255107d266d5aaca66cfd9e502aa2b9faa9e6 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 3 Oct 2014 12:06:17 -0700 Subject: [PATCH] Fix percentage formatting in SystemUI. Also remove some orphaned strings that tried to format percentages wrongly. (The ar and fa localizations will be clobbered, but this lets you test this change independently.) Bug: 15476051 Change-Id: Ifd97d47446bdd2e95298b04e1a11542dfed7f9a1 --- packages/SystemUI/res/values-ar/strings.xml | 7 ++----- packages/SystemUI/res/values-fa/strings.xml | 7 ++----- packages/SystemUI/res/values/strings.xml | 18 +++--------------- .../power/PowerNotificationWarnings.java | 4 +++- .../statusbar/phone/KeyguardStatusBarView.java | 5 ++++- .../statusbar/phone/StatusBarHeaderView.java | 5 ++++- 6 files changed, 18 insertions(+), 28 deletions(-) diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index ea5be809cfcea..8f411d2c5a836 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -33,8 +33,8 @@ "مستمر" "الإشعارات" "البطارية منخفضة" - "المتبقي: %d%%" - "يتبقى %d%%. وضع توفير الطاقة قيد التشغيل." + "المتبقي: %s" + "يتبقى %s. وضع توفير الطاقة قيد التشغيل." "‏شحن USB غير معتمد.\nاستخدم الشاحن الموفر فقط." "‏لا يمكن إجراء الشحن عبر USB." "لا تستخدم سوى الشاحن المزوّد." @@ -224,8 +224,6 @@ "حلم اليقظة" "Ethernet" "وضع الطائرة" - "جارٍ الشحن، %d%%" - "تم الشحن" "بلوتوث" "بلوتوث (%d من الأجهزة)" "إيقاف البلوتوث" @@ -324,7 +322,6 @@ "وضع توفير الطاقة قيد التشغيل" "لخفض مستوى الأداء وبيانات الخلفية" "إيقاف توفير شحن البطارية" - "%d%%" "المحتويات مخفية" "%s سيبدأ التقاط كل شيء يتم عرضه على الشاشة." "عدم الإظهار مرة أخرى" diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 98ece3c764921..dc5105aa83470 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -33,8 +33,8 @@ "در حال انجام" "اعلان‌ها" "شارژ باتری کم است" - "%d%% باقیمانده است" - "%d%% باقی مانده است. ذخیره کننده باتری روشن است." + "%s باقیمانده است" + "%s باقی مانده است. ذخیره کننده باتری روشن است." "‏شارژ USB پشتیبانی نمی‌شود.\nفقط از شارژر ارائه شده استفاده کنید." "‏شارژ با USB پشتیبانی نمی‌شود." "فقط از شارژر ارائه شده استفاده کنید." @@ -224,8 +224,6 @@ "رویاپردازی" "اترنت" "حالت هواپیما" - "در حال شارژ، %d%%" - "شارژ شد" "بلوتوث" "بلوتوث ( %d دستگاه)" "بلوتوث خاموش" @@ -324,7 +322,6 @@ "ذخیره کننده باتری روشن است." "عملکرد و اطلاعات پس‌زمینه را کاهش می‌دهد" "خاموش کردن ذخیره‌کننده باتری" - "%d%%" "محتواها پنهان هستند" "%s شروع به ضبط هر چیزی می‌کند که در صفحه‌نمایش شما نمایش داده می‌شود." "دوباره نشان داده نشود" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 9ee18f3209fa9..048829d39deb2 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -62,12 +62,12 @@ Battery is low - %d%% remaining + %s remaining - %d%% remaining. Battery saver is on. + %s remaining. Battery saver is on. Notifications - - - %d%% - - | @@ -559,10 +554,6 @@ Airplane mode - - Charging, %d%% - - Charged Bluetooth @@ -813,9 +804,6 @@ Turn off battery saver - - %d%% - Contents hidden diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index f184ad2653cb9..f69f2e6f1a41d 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -43,6 +43,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBar; import com.android.systemui.statusbar.phone.SystemUIDialog; import java.io.PrintWriter; +import java.text.NumberFormat; public class PowerNotificationWarnings implements PowerUI.WarningsUI { private static final String TAG = PowerUI.TAG + ".Notification"; @@ -171,13 +172,14 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private void showWarningNotification() { final int textRes = mSaver ? R.string.battery_low_percent_format_saver_started : R.string.battery_low_percent_format; + final String percentage = NumberFormat.getPercentInstance().format((double) mBatteryLevel / 100.0); final Notification.Builder nb = new Notification.Builder(mContext) .setSmallIcon(R.drawable.ic_power_low) // Bump the notification when the bucket dropped. .setWhen(mBucketDroppedNegativeTimeMs) .setShowWhen(false) .setContentTitle(mContext.getString(R.string.battery_low_title)) - .setContentText(mContext.getString(textRes, mBatteryLevel)) + .setContentText(mContext.getString(textRes, percentage)) .setOnlyAlertOnce(true) .setPriority(Notification.PRIORITY_MAX) .setCategory(Notification.CATEGORY_SYSTEM) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index 650a14fc33a03..40c913440472e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -36,6 +36,8 @@ import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.KeyguardUserSwitcher; import com.android.systemui.statusbar.policy.UserInfoController; +import java.text.NumberFormat; + /** * The header group on Keyguard. */ @@ -150,7 +152,8 @@ public class KeyguardStatusBarView extends RelativeLayout @Override public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) { - mBatteryLevel.setText(getResources().getString(R.string.battery_level_template, level)); + String percentage = NumberFormat.getPercentInstance().format((double) level / 100.0); + mBatteryLevel.setText(percentage); boolean changed = mBatteryCharging != charging; mBatteryCharging = charging; if (changed) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java index b0f3ea1ec48d5..ca853a964d292 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -48,6 +48,8 @@ import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.NextAlarmController; import com.android.systemui.statusbar.policy.UserInfoController; +import java.text.NumberFormat; + /** * The view to manage the header area in the expanded status bar. */ @@ -395,7 +397,8 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL @Override public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) { - mBatteryLevel.setText(getResources().getString(R.string.battery_level_template, level)); + String percentage = NumberFormat.getPercentInstance().format((double) level / 100.0); + mBatteryLevel.setText(percentage); } @Override