Merge "[SettingsProvider] fix font size scale validator" into rvc-dev am: 9431e05686

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13178963

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b35352429798e8a7197a713d1fa548e1a434f62
This commit is contained in:
Songchun Fan
2020-12-09 00:15:48 +00:00
committed by Automerger Merge Worker

View File

@@ -89,15 +89,7 @@ public class SystemSettingsValidators {
return value == null || value.length() < MAX_LENGTH; return value == null || value.length() < MAX_LENGTH;
} }
}); });
VALIDATORS.put( VALIDATORS.put(System.FONT_SCALE, new InclusiveFloatRangeValidator(0.85f, 1.3f));
System.FONT_SCALE,
value -> {
try {
return Float.parseFloat(value) >= 0;
} catch (NumberFormatException | NullPointerException e) {
return false;
}
});
VALIDATORS.put(System.DIM_SCREEN, BOOLEAN_VALIDATOR); VALIDATORS.put(System.DIM_SCREEN, BOOLEAN_VALIDATOR);
VALIDATORS.put( VALIDATORS.put(
System.DISPLAY_COLOR_MODE, System.DISPLAY_COLOR_MODE,