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

Merge "Add SCREEN_BRIGHTNESS_FOR_VR to set of public settings." into pi-dev

Browse Source 
am: 7830cd820b

Change-Id: I0f2e831b4948cf854dbefe590879356c25131633
This commit is contained in:
Santos Cordon
2018-05-15 17:39:19 -07:00
committed by android-build-merger
parent 1b5a976d8c 7830cd820b
commit 9cb0a9f1aa
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4195,6 +4195,7 @@ public final class Settings {
PUBLIC_SETTINGS.add(DIM_SCREEN);
PUBLIC_SETTINGS.add(SCREEN_OFF_TIMEOUT);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR);
PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -2300,6 +2300,9 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadIntegerSetting(stmt, Settings.System.SCREEN_BRIGHTNESS,
R.integer.def_screen_brightness);
loadIntegerSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_FOR_VR,
com.android.internal.R.integer.config_screenBrightnessForVrSettingDefault);
loadBooleanSetting(stmt, Settings.System.SCREEN_BRIGHTNESS_MODE,
R.bool.def_screen_brightness_automatic_mode);