summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-06-02 17:34:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 17:34:03 -0700
commitca2b552d981239043a575dfc9db86966492d0f9e (patch)
tree5126b8a386f7aff3e19cf4ae9d253705aa0efddb /packages
parent56503b8ddfe5c82407da32e18061e725f668432d (diff)
parentc8812761609e532cceb400b112ed9982149c2490 (diff)
downloadframeworks_base-ca2b552d981239043a575dfc9db86966492d0f9e.zip
frameworks_base-ca2b552d981239043a575dfc9db86966492d0f9e.tar.gz
frameworks_base-ca2b552d981239043a575dfc9db86966492d0f9e.tar.bz2
am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'c8812761609e532cceb400b112ed9982149c2490': Add a preference panel for mouse speed.
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml3
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index bf06f947..2e2768f 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -125,4 +125,7 @@
<!-- Default for Settings.Secure.LONG_PRESS_TIMEOUT_MILLIS -->
<integer name="def_long_press_timeout_millis">500</integer>
+ <!-- Default for Settings.System.POINTER_SPEED -->
+ <integer name="def_pointer_speed">0</integer>
+
</resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index d901c2c..2ed968b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1214,6 +1214,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME,
R.bool.def_notifications_use_ring_volume);
+ loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,
+ R.integer.def_pointer_speed);
+
} finally {
if (stmt != null) stmt.close();
}