diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-01-08 18:54:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-08 18:54:05 +0000 |
| commit | 613b60451d4e756aaff16d798de6bb9e8328245c (patch) | |
| tree | 7a6f078942ad28155467516468d2150e52612d5a | |
| parent | b859449b717b24ac6e678c303d7706d55fd184f7 (diff) | |
| parent | c02c4a7c5b393c5527de17faca759ff00be61ce5 (diff) | |
| download | frameworks_base-613b60451d4e756aaff16d798de6bb9e8328245c.zip frameworks_base-613b60451d4e756aaff16d798de6bb9e8328245c.tar.gz frameworks_base-613b60451d4e756aaff16d798de6bb9e8328245c.tar.bz2 | |
Merge "SettingsProvider: Allow disabling immersive mode confirmation for specific packages"
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 6 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index a1d8f22..28f50bc 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -173,4 +173,10 @@ 0 means no timeout; battery sounds will always play >0 is milliseconds of screen-off time after which battery sounds will not play --> <integer name="def_low_battery_sound_timeout">0</integer> + + <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting, + which is a comma separated list of packages that no longer need confirmation + for immersive mode. + Override to disable immersive mode confirmation for certain packages. --> + <string name="def_immersive_mode_confirmations" translatable="false"></string> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b71796e..e3a3691 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2111,6 +2111,10 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.Secure.USER_SETUP_COMPLETE, R.bool.def_user_setup_complete); + + loadStringSetting(stmt, Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS, + R.string.def_immersive_mode_confirmations); + } finally { if (stmt != null) stmt.close(); } |