From 5177da3b01c2b8e23ff3820fe07b5761e8ee4d36 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Wed, 7 Feb 2018 14:03:14 -0800 Subject: [PATCH] Add SCREEN_BRIGHTNESS_FOR_VR to set of public settings. This will allow the settings to be adjusted by any third party app, just like SCREEN_BRIGHTNESS is today. Additionally adds the default value to the SystemSettings database on initial setup. Test: After clean install check that the default value is in the DB via 'adb shell settings get system screen_brightness_for_vr' Test: Verify that SCREEN_BRIGHTNESS_FOR_VR can be changed by a 3rd party app with WRITE_SETTINGS permission. Bug: 73090564 Change-Id: I93d167ab23652c39b0cf815eb40935be26b857a6 (cherry picked from commit 5956f49210f32b8ceabf860f904b5ca77ec9631c) --- core/java/android/provider/Settings.java | 1 + .../src/com/android/providers/settings/DatabaseHelper.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 49fc78f38212a..2ae78766a4511 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4127,6 +4127,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); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 4530f8062f0db..e853399133aaf 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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);