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

Merge "Default font scale is 1 if not otherwise specified" into nyc-dev

Browse Source 
am: 0f0ffb0

* commit '0f0ffb0450e223dab3a0e85f2968156c0da324b3':
  Default font scale is 1 if not otherwise specified

Change-Id: I25965bc2f5ec3dbd7a517f7b69f1cfa50fbaa5ce
This commit is contained in:
Alan Viverette
2016-04-12 16:34:56 +00:00
committed by android-build-merger
parent 5986b16057 0f0ffb0450
commit 6265624bf3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1581,6 +1581,8 @@ public final class Settings {
public static final class System extends NameValueTable {
public static final String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";
private static final float DEFAULT_FONT_SCALE = 1.0f;
/** @hide */
public static interface Validator {
public boolean validate(String value);
@@ -2089,9 +2091,9 @@ public final class Settings {
public static void getConfigurationForUser(ContentResolver cr, Configuration outConfig,
int userHandle) {
outConfig.fontScale = Settings.System.getFloatForUser(
cr, FONT_SCALE, outConfig.fontScale, userHandle);
cr, FONT_SCALE, DEFAULT_FONT_SCALE, userHandle);
if (outConfig.fontScale < 0) {
outConfig.fontScale = 1;
outConfig.fontScale = DEFAULT_FONT_SCALE;
}
outConfig.setLocales(LocaleList.forLanguageTags(
Settings.System.getStringForUser(cr, SYSTEM_LOCALES, userHandle)));