diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-06-02 17:28:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 17:28:07 -0700 |
| commit | c8812761609e532cceb400b112ed9982149c2490 (patch) | |
| tree | f12190c422dd4e3455af0fa9e036b604007c9be4 /packages | |
| parent | 8186a5f065fac2b82c90cd18d79cd234bc221402 (diff) | |
| parent | e1718de61c20c8d401633f83589f18d2c0c652db (diff) | |
| download | frameworks_base-c8812761609e532cceb400b112ed9982149c2490.zip frameworks_base-c8812761609e532cceb400b112ed9982149c2490.tar.gz frameworks_base-c8812761609e532cceb400b112ed9982149c2490.tar.bz2 | |
am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
Add a preference panel for mouse speed.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
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(); } |