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

13
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -40,6 +40,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserFeatureProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
@@ -192,16 +193,16 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
case CONTACTS:
return context.getString(R.string.default_contacts_app_title);
case PHONE:
return context.getResources()
.getQuantityString(R.plurals.default_phone_app_title, appCount);
return StringUtil.getIcuPluralsString(context, appCount,
R.string.default_phone_app_title);
case MAP:
return context.getString(R.string.default_map_app_title);
case EMAIL:
return context.getResources()
.getQuantityString(R.plurals.default_email_app_title, appCount);
return StringUtil.getIcuPluralsString(context, appCount,
R.string.default_email_app_title);
case CAMERA:
return context.getResources()
.getQuantityString(R.plurals.default_camera_app_title, appCount);
return StringUtil.getIcuPluralsString(context, appCount,
R.string.default_camera_app_title);
default:
throw new IllegalStateException("Unknown type of default " + typeOfDefault);
}