summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2011-10-16 12:31:36 +0200
committerPaul Kocialkowski <contact@paulk.fr>2012-07-09 12:54:39 +0200
commitdef83e8e245265e529b8418ba7967b75cce5c45a (patch)
treec4e8a8075ae86e44934331c74dfed2867bc16123
parentd8ae401dd7c42b34b5cd6f6ea5a4d86066445057 (diff)
downloadframeworks_base-def83e8e245265e529b8418ba7967b75cce5c45a.zip
frameworks_base-def83e8e245265e529b8418ba7967b75cce5c45a.tar.gz
frameworks_base-def83e8e245265e529b8418ba7967b75cce5c45a.tar.bz2
Corrected instructions to disable screen-on and screen-off animations.
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java16
1 files changed, 7 insertions, 9 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index dfec6f8..1caa78b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -243,8 +243,6 @@ 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,
@@ -1020,7 +1018,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
"1".equals(SystemProperties.get("ro.kernel.qemu")) ? 1 : 0);
loadIntegerSetting(stmt, Settings.System.SCREEN_OFF_TIMEOUT,
R.integer.def_screen_off_timeout);
-
+
+ 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);
+
// Set default cdma emergency tone
loadSetting(stmt, Settings.System.EMERGENCY_TONE, 0);
@@ -1133,12 +1137,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
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);