summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2020-12-09 00:16:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-09 00:16:42 +0000
commit19b92f5cce59bd84a22a7914ff007482ccd27de9 (patch)
treefad792f18533c19cabbaab17016cef35381f177e
parent1494354af475c6ed569c08b293784ac1f152a1a2 (diff)
parent9431e05686a2438d33cd74c10e34369d5712f70d (diff)
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: I644bb3693449bca91b38a747b14ab540244af002
-rw-r--r--packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
index c5d4fa9f1b40..cb610fc61142 100644
--- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
+++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
@@ -89,15 +89,7 @@ public class SystemSettingsValidators {
return value == null || value.length() < MAX_LENGTH;
}
});
- VALIDATORS.put(
- System.FONT_SCALE,
- value -> {
- try {
- return Float.parseFloat(value) >= 0;
- } catch (NumberFormatException | NullPointerException e) {
- return false;
- }
- });
+ VALIDATORS.put(System.FONT_SCALE, new InclusiveFloatRangeValidator(0.85f, 1.3f));
VALIDATORS.put(System.DIM_SCREEN, BOOLEAN_VALIDATOR);
VALIDATORS.put(
System.DISPLAY_COLOR_MODE,