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

Merge "For Force Bold Text, adjust the configuration between users"

Browse Source
This commit is contained in:
Sally Yuen
2020-10-02 20:49:57 +00:00
committed by Android (Google) Code Review
parent 07b1ffb271 834e5c3410
commit a080261e88
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -3567,6 +3567,9 @@ public final class Settings {
if (outConfig.fontScale < 0) {
outConfig.fontScale = DEFAULT_FONT_SCALE;
}
outConfig.forceBoldText = Settings.Secure.getIntForUser(
cr, Settings.Secure.FORCE_BOLD_TEXT, Configuration.FORCE_BOLD_TEXT_NO,
userHandle);
final String localeValue =
Settings.System.getStringForUser(cr, SYSTEM_LOCALES, userHandle);
@@ -3597,6 +3600,7 @@ public final class Settings {
if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
inoutConfig.clearLocales();
}
inoutConfig.forceBoldText = Configuration.FORCE_BOLD_TEXT_UNDEFINED;
}
/**
@@ -3620,7 +3624,11 @@ public final class Settings {
DEFAULT_OVERRIDEABLE_BY_RESTORE);
}
/** @hide */
/**
* Convenience function for checking if settings should be overwritten with config changes.
* @see #putConfigurationForUser(ContentResolver, Configuration, int)
* @hide
*/
public static boolean hasInterestingConfigurationChanges(int changes) {
return (changes & ActivityInfo.CONFIG_FONT_SCALE) != 0 ||
(changes & ActivityInfo.CONFIG_LOCALE) != 0;