PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup some plurals in Settings

Browse Source 
Change <one> to <1> in string res file, and update related java files.
Test: Update, existing test still pass.
bug: 199230342

Change-Id: Idd0ba3c6adc060da21574d98f8ed765fae00cef8
This commit is contained in:
xinghailu
2022-12-21 20:57:43 +08:00
parent b603ff7b19
commit 897fd74731
31 changed files with 281 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
View File

@@ -13,6 +13,7 @@ import androidx.lifecycle.LifecycleOwner;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -22,6 +23,9 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.HashMap;
import java.util.Map;
@RunWith(RobolectricTestRunner.class)
public class AppLocationPermissionPreferenceControllerTest {
@@ -86,8 +90,11 @@ public class AppLocationPermissionPreferenceControllerTest {
mController.mNumHasLocation = 1;
mController.mNumTotal = 1;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
R.plurals.location_app_permission_summary_location_on, 1, 1, 1));
Map<String, Object> arguments = new HashMap<>();
arguments.put("count", 1);
arguments.put("total", 1);
assertThat(mController.getSummary()).isEqualTo(StringUtil.getIcuPluralsString(mContext,
arguments, R.string.location_app_permission_summary_location_on));
}
@Test
@@ -96,7 +103,10 @@ public class AppLocationPermissionPreferenceControllerTest {
mController.mNumHasLocation = 5;
mController.mNumTotal = 10;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
R.plurals.location_app_permission_summary_location_on, 5, 5, 10));
Map<String, Object> arguments = new HashMap<>();
arguments.put("count", 5);
arguments.put("total", 10);
assertThat(mController.getSummary()).isEqualTo(StringUtil.getIcuPluralsString(mContext,
arguments, R.string.location_app_permission_summary_location_on));
}
}