diff options
author | Ankit Gupta <agupta@cyngn.com> | 2016-02-18 11:39:51 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-04 09:54:20 -0800 |
commit | c014d6c5814fe766bc8ba586919e0986297b23d1 (patch) | |
tree | b7fe2c5bcfc73950da40fbe0c540cdfc777e4091 /packages | |
parent | 9ae49e005d7a880d160a9b6a5795351a5d588da0 (diff) | |
download | frameworks_base-c014d6c5814fe766bc8ba586919e0986297b23d1.zip frameworks_base-c014d6c5814fe766bc8ba586919e0986297b23d1.tar.gz frameworks_base-c014d6c5814fe766bc8ba586919e0986297b23d1.tar.bz2 |
SettingsProvider: allow ambient display/doze mode to be overlayed
Issue-id: YAM-140
Change-Id: I3c296c645281509b7860e54d4e32790881d30ed6
(cherry picked from commit 3c1279528e3a6017ff42f2d7aa436be88c9022fa)
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 1 | ||||
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 1346788..3ac4d51 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -41,6 +41,7 @@ <fraction name="def_window_animation_scale">100%</fraction> <fraction name="def_window_transition_scale">100%</fraction> <bool name="def_haptic_feedback">true</bool> + <bool name="def_dozeEnabledByDefault">false</bool> <bool name="def_bluetooth_on">false</bool> <bool name="def_wifi_display_on">false</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2b5c14f..f5f8ce6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2710,6 +2710,8 @@ class DatabaseHelper extends SQLiteOpenHelper { com.android.internal.R.string.config_dreamsDefaultComponent); loadStringSetting(stmt, Settings.Secure.SCREENSAVER_DEFAULT_COMPONENT, com.android.internal.R.string.config_dreamsDefaultComponent); + loadBooleanSetting(stmt, Settings.Secure.DOZE_ENABLED, + R.bool.def_dozeEnabledByDefault); loadBooleanSetting(stmt, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, R.bool.def_accessibility_display_magnification_enabled); |