Cleanup plurals format

Change <one> to <1> in string res file
Test: Update, existing tests still pass
bug: 199230342

Change-Id: Ic3a5259570cb52cd1664638f3b1058c87a631c04

src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java

@@ -31,6 +31,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryTipUtils;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.utils.StringUtil;
 
 import java.util.List;
 
@@ -75,9 +76,8 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
         final int num = mAppInfos.size();
         // Fragment change RestrictedAppsList after onPause(), UI needs to be updated in onResume()
         preference.setVisible(num > 0);
-        preference.setSummary(
-                mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
-                        num));
+        preference.setSummary(StringUtil.getIcuPluralsString(mContext, num,
+                        R.string.restricted_app_summary));
     }
 
     @Override

src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java

@@ -27,6 +27,7 @@ import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.utils.StringUtil;
 
 /**
  * Preference controller to control the battery manager
@@ -67,8 +68,8 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
     @VisibleForTesting
     void updateSummary(Preference preference, int num) {
         if (num > 0) {
-            preference.setSummary(mContext.getResources().getQuantityString(
-                    R.plurals.battery_manager_app_restricted, num, num));
+            preference.setSummary(StringUtil.getIcuPluralsString(mContext, num,
+                    R.string.battery_manager_app_restricted));
         } else {
             preference.setSummary(
                     mPowerUsageFeatureProvider.isAdaptiveChargingSupported()

src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java

@@ -42,6 +42,7 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
+import com.android.settingslib.utils.StringUtil;
 
 import java.util.List;
 
@@ -107,8 +108,8 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
                         restrictedAppList.get(0).packageName);
 
                 final AlertDialog.Builder builder = new AlertDialog.Builder(context)
-                        .setTitle(context.getResources().getQuantityString(
-                                R.plurals.battery_tip_restrict_app_dialog_title, num, num))
+                        .setTitle(StringUtil.getIcuPluralsString(context, num,
+                                R.string.battery_tip_restrict_app_dialog_title))
                         .setPositiveButton(R.string.battery_tip_restrict_app_dialog_ok, this)
                         .setNegativeButton(android.R.string.cancel, null);
                 if (num == 1) {

src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java

@@ -28,9 +28,12 @@ import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.utils.StringUtil;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Tip to suggest user to restrict some bad apps
@@ -62,12 +65,15 @@ public class RestrictAppTip extends BatteryTip {
         final int num = mRestrictAppList.size();
         final CharSequence appLabel = num > 0 ? Utils.getApplicationLabel(context,
                 mRestrictAppList.get(0).packageName) : "";
-        final Resources resources = context.getResources();
 
+        Map<String, Object> arguments = new HashMap<>();
+        arguments.put("count", num);
+        arguments.put("label", appLabel);
         return mState == StateType.HANDLED
-                ? resources.getQuantityString(R.plurals.battery_tip_restrict_handled_title, num,
-                appLabel, num)
-                : resources.getQuantityString(R.plurals.battery_tip_restrict_title, num, num);
+                ? StringUtil.getIcuPluralsString(context, arguments,
+                R.string.battery_tip_restrict_handled_title)
+                : StringUtil.getIcuPluralsString(context, arguments,
+                R.string.battery_tip_restrict_title);
     }
 
     @Override
@@ -76,9 +82,12 @@ public class RestrictAppTip extends BatteryTip {
         final CharSequence appLabel = num > 0 ? Utils.getApplicationLabel(context,
                 mRestrictAppList.get(0).packageName) : "";
         final int resId = mState == StateType.HANDLED
-                ? R.plurals.battery_tip_restrict_handled_summary
-                : R.plurals.battery_tip_restrict_summary;
-        return context.getResources().getQuantityString(resId, num, appLabel, num);
+                ? R.string.battery_tip_restrict_handled_summary
+                : R.string.battery_tip_restrict_summary;
+        Map<String, Object> arguments = new HashMap<>();
+        arguments.put("count", num);
+        arguments.put("label", appLabel);
+        return StringUtil.getIcuPluralsString(context, arguments, resId);
     }
 
     @Override