summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-01-07 14:46:22 -0800
committerMike Lockwood <lockwood@google.com>2014-01-08 10:48:03 -0800
commitc02c4a7c5b393c5527de17faca759ff00be61ce5 (patch)
tree0625907bfa1fa342bd7c27e592aa548ba6993bf1 /packages/SettingsProvider
parentc975437ef3338ba38b76b1a07594ccfd6e089709 (diff)
downloadframeworks_base-c02c4a7c5b393c5527de17faca759ff00be61ce5.zip
frameworks_base-c02c4a7c5b393c5527de17faca759ff00be61ce5.tar.gz
frameworks_base-c02c4a7c5b393c5527de17faca759ff00be61ce5.tar.bz2
SettingsProvider: Allow disabling immersive mode confirmation for specific packages
Change-Id: I2fac06cbe3321d7384278d875c91128bcc15d629
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml6
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java4
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();
}