summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2011-10-14 23:21:17 +0200
committerPaul Kocialkowski <contact@paulk.fr>2012-07-09 12:54:39 +0200
commitd8ae401dd7c42b34b5cd6f6ea5a4d86066445057 (patch)
treebf2cf0a90bd4024dd81ef3819d1e0484ec2997c6
parentc17a7d18fbb255d1aab30e3d5f1e339b345b5580 (diff)
downloadframeworks_base-d8ae401dd7c42b34b5cd6f6ea5a4d86066445057.zip
frameworks_base-d8ae401dd7c42b34b5cd6f6ea5a4d86066445057.tar.gz
frameworks_base-d8ae401dd7c42b34b5cd6f6ea5a4d86066445057.tar.bz2
Disabled screen-on and screen-off animations by default.
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml2
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java10
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 0605fe9..22b5731 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -32,6 +32,8 @@
<fraction name="def_window_transition_scale">100%</fraction>
<bool name="def_haptic_feedback">true</bool>
+ <bool name="def_electron_beam_animation_on">false</bool>
+ <bool name="def_electron_beam_animation_off">false</bool>
<bool name="def_bluetooth_on">false</bool>
<bool name="def_install_non_market_apps">false</bool>
<!-- Comma-separated list of location providers.
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 1e93c8d..dfec6f8 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -243,6 +243,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
Settings.Secure.BLUETOOTH_ON,
Settings.Secure.DATA_ROAMING,
Settings.Secure.DEVICE_PROVISIONED,
+ Settings.System.ELECTRON_BEAM_ANIMATION_ON,
+ Settings.System.ELECTRON_BEAM_ANIMATION_OFF,
Settings.Secure.HTTP_PROXY,
Settings.Secure.INSTALL_NON_MARKET_APPS,
Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
@@ -1130,7 +1132,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
"true".equalsIgnoreCase(
SystemProperties.get("ro.com.android.dataroaming",
"false")) ? 1 : 0);
-
+
+ loadBooleanSetting(stmt, Settings.System.ELECTRON_BEAM_ANIMATION_ON,
+ R.bool.def_electron_beam_animation_on);
+
+ loadBooleanSetting(stmt, Settings.System.ELECTRON_BEAM_ANIMATION_OFF,
+ R.bool.def_electron_beam_animation_off);
+
loadBooleanSetting(stmt, Settings.Secure.INSTALL_NON_MARKET_APPS,
R.bool.def_install_non_market_apps);