diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-06-03 15:50:27 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-06-03 15:50:27 -0700 |
| commit | 7218d830e27d81141588cd6e37f206d141a18f62 (patch) | |
| tree | fae19a482a9c238fb94b1f46e7b37daf4f18a3ab /packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | |
| parent | a742f854901b8306d3696c9e9b7881c207130a01 (diff) | |
| parent | ca2b552d981239043a575dfc9db86966492d0f9e (diff) | |
| download | frameworks_base-7218d830e27d81141588cd6e37f206d141a18f62.zip frameworks_base-7218d830e27d81141588cd6e37f206d141a18f62.tar.gz frameworks_base-7218d830e27d81141588cd6e37f206d141a18f62.tar.bz2 | |
resolved conflicts for merge of ca2b552d to master
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b99c8b0..0f5f095 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(); } |