Cleanup plurals format

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

Change-Id: Ic3a5259570cb52cd1664638f3b1058c87a631c04
This commit is contained in:
xinghailu
2022-12-27 12:12:11 +08:00
parent 6f77562412
commit 1637a3a10a
30 changed files with 235 additions and 210 deletions

View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.location.LocationManager;
import com.android.settings.R;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -67,9 +68,8 @@ public class TopLevelLocationPreferenceControllerTest {
// Turn on location again and check if the previous summary text is still cached.
mLocationManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
assertThat(mController.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.location_settings_summary_location_on, locationAppCount,
locationAppCount));
StringUtil.getIcuPluralsString(mContext, locationAppCount,
R.string.location_settings_summary_location_on));
}
@Test
@@ -78,9 +78,8 @@ public class TopLevelLocationPreferenceControllerTest {
mLocationManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
mController.setLocationAppCount(locationAppCount);
assertThat(mController.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.location_settings_summary_location_on,
locationAppCount, locationAppCount));
StringUtil.getIcuPluralsString(mContext, locationAppCount,
R.string.location_settings_summary_location_on));
}
@Test
@@ -89,8 +88,7 @@ public class TopLevelLocationPreferenceControllerTest {
mLocationManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
mController.setLocationAppCount(locationAppCount);
assertThat(mController.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.location_settings_summary_location_on,
locationAppCount, locationAppCount));
StringUtil.getIcuPluralsString(mContext, locationAppCount,
R.string.location_settings_summary_location_on));
}
}