Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Panlingual] Add the doc link and remove TODO description" into udc-dev

Browse Source
This commit is contained in:
Josh Hou
2023-05-10 14:27:35 +00:00
committed by Android (Google) Code Review
parent 1c3a7005fa 319279c8e0
commit ff87f9e88a
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/LocaleConfig.java
View File

@@ -161,7 +161,7 @@ public class LocaleConfig implements Parcelable {
* <p><b>Note:</b> The creation of this LocaleConfig does not automatically mean it will
* become the override config for an application. Any LocaleConfig desired to be the override
* must be passed into the {@link LocaleManager#setOverrideLocaleConfig(LocaleConfig)},
* otherwise it will not persist or affect the system’s understanding of app-supported
* otherwise it will not persist or affect the system&#39;s understanding of app-supported
* resources.
*
* @param locales the desired locales for a specified application

11
core/java/android/app/LocaleManager.java
View File

@@ -194,18 +194,19 @@ public class LocaleManager {
* <p><b>Note:</b> Only the app itself with the same user can override its own LocaleConfig.
*
* <p><b>Note:</b> This function takes in a {@link LocaleConfig} which is intended to
* override the original config in the application’s resources. This LocaleConfig will become
* the override config, and stored in a system file for future access.
* override the original config in the application&#39;s resources. This LocaleConfig will
* become the override config, and stored in a system file for future access.
*
* <p><b>Note:</b> Using this function, applications can update their list of supported
* locales while running, without an update of the application’s software.
* locales while running, without an update of the application&#39;s software. For more
* information, see the <a
* href="https://developer.android.com/about/versions/14/features#app-languages">section on
* dynamic updates for an app's localeConfig</a>.
*
* <p>Applications can remove the override LocaleConfig with a {@code null} object.
*
* @param localeConfig the desired {@link LocaleConfig} for the calling app.
*/
// Add following to last Note: when guide is written:
// For more information, see TODO(b/261528306): add link to guide.
@UserHandleAware
public void setOverrideLocaleConfig(@Nullable LocaleConfig localeConfig) {
try {

7
services/core/java/com/android/server/locales/LocaleManagerService.java
View File

@@ -103,8 +103,8 @@ public class LocaleManagerService extends SystemService {
private final PackageMonitor mPackageMonitor;
private final Object mWriteLock = new Object();
// TODO(b/262713398): Set to false when stable
public static final boolean DEBUG = true;
public static final boolean DEBUG = false;
public LocaleManagerService(Context context) {
super(context);
@@ -565,7 +565,6 @@ public class LocaleManagerService extends SystemService {
*/
public void setOverrideLocaleConfig(@NonNull String appPackageName, @UserIdInt int userId,
@Nullable LocaleConfig localeConfig) throws IllegalArgumentException {
// TODO(b/262713398): Remove when stable
if (!SystemProperties.getBoolean(PROP_DYNAMIC_LOCALES_CHANGE, true)) {
return;
}
@@ -747,7 +746,6 @@ public class LocaleManagerService extends SystemService {
@Nullable
public LocaleConfig getOverrideLocaleConfig(@NonNull String appPackageName,
@UserIdInt int userId) {
// TODO(b/262713398): Remove when stable
if (!SystemProperties.getBoolean(PROP_DYNAMIC_LOCALES_CHANGE, true)) {
return null;
}
@@ -850,7 +848,6 @@ public class LocaleManagerService extends SystemService {
@NonNull
private File getXmlFileNameForUser(@NonNull String appPackageName, @UserIdInt int userId) {
// TODO(b/262752965): use per-package data directory
final File dir = new File(Environment.getDataSystemCeDirectory(userId), LOCALE_CONFIGS);
return new File(dir, appPackageName + SUFFIX_FILE_NAME);
}