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

Merge "Whitelist DISPLAY_COLOR_MODE setting for B&R" into pi-dev

Browse Source
This commit is contained in:
Christine Franks
2018-04-10 00:16:02 +00:00
committed by Android (Google) Code Review
parent daafeb35a1 1269960d99
commit a1b3aa27dd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3113,6 +3113,9 @@ public final class Settings {
*/
public static final String DISPLAY_COLOR_MODE = "display_color_mode";
private static final Validator DISPLAY_COLOR_MODE_VALIDATOR =
new SettingsValidators.InclusiveIntegerRangeValidator(0, 2);
/**
* The amount of time in milliseconds before the device goes to sleep or begins
* to dream after a period of inactivity. This value is also known as the
@@ -4092,6 +4095,7 @@ public final class Settings {
SHOW_BATTERY_PERCENT,
NOTIFICATION_VIBRATION_INTENSITY,
HAPTIC_FEEDBACK_INTENSITY,
DISPLAY_COLOR_MODE
};
/**
@@ -4204,6 +4208,7 @@ public final class Settings {
PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED);
PRIVATE_SETTINGS.add(EGG_MODE);
PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT);
PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE);
}
/**
@@ -4225,6 +4230,7 @@ public final class Settings {
VALIDATORS.put(NEXT_ALARM_FORMATTED, NEXT_ALARM_FORMATTED_VALIDATOR);
VALIDATORS.put(FONT_SCALE, FONT_SCALE_VALIDATOR);
VALIDATORS.put(DIM_SCREEN, DIM_SCREEN_VALIDATOR);
VALIDATORS.put(DISPLAY_COLOR_MODE, DISPLAY_COLOR_MODE_VALIDATOR);
VALIDATORS.put(SCREEN_OFF_TIMEOUT, SCREEN_OFF_TIMEOUT_VALIDATOR);
VALIDATORS.put(SCREEN_BRIGHTNESS_FOR_VR, SCREEN_BRIGHTNESS_FOR_VR_VALIDATOR);
VALIDATORS.put(SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_VALIDATOR);

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -60,7 +60,6 @@ public class SettingsBackupTest {
Settings.System.ALARM_ALERT, // backup candidate?
Settings.System.ALARM_ALERT_CACHE, // internal cache
Settings.System.APPEND_FOR_LAST_AUDIBLE, // suffix deprecated since API 2
Settings.System.DISPLAY_COLOR_MODE, // bug?
Settings.System.EGG_MODE, // I am the lolrus
Settings.System.END_BUTTON_BEHAVIOR, // bug?
Settings.System