Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a52be7ce authored by Santos Cordon's avatar Santos Cordon Committed by android-build-merger
Browse files

Merge "Add SCREEN_BRIGHTNESS_FOR_VR to set of public settings." into pi-dev am: 7830cd82 

am: 9cb0a9f1

Change-Id: If36f69de41e1caaaf6ec5adf47cca7b4935b222e
parents ea1b1a62 9cb0a9f1

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -4196,6 +4196,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);

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -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);