diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 4 | ||||
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 2df6d68..bf06f947 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -121,4 +121,8 @@ <integer name="def_download_manager_max_bytes_over_mobile">-1</integer> <!-- Default for Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE. <=0 if no limit --> <integer name="def_download_manager_recommended_max_bytes_over_mobile">-1</integer> + + <!-- Default for Settings.Secure.LONG_PRESS_TIMEOUT_MILLIS --> + <integer name="def_long_press_timeout_millis">500</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 f336f06..d901c2c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -819,6 +819,24 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 64; } + if (upgradeVersion == 64) { + // New setting to configure the long press timeout. + db.beginTransaction(); + SQLiteStatement stmt = null; + try { + stmt = db.compileStatement("INSERT INTO secure(name,value)" + + " VALUES(?,?);"); + loadIntegerSetting(stmt, Settings.Secure.LONG_PRESS_TIMEOUT, + R.integer.def_long_press_timeout_millis); + stmt.close(); + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + if (stmt != null) stmt.close(); + } + upgradeVersion = 65; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { @@ -1332,6 +1350,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadSetting(stmt, Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE, Integer.toString(recommendedMaxBytes)); } + + loadIntegerSetting(stmt, Settings.Secure.LONG_PRESS_TIMEOUT, + R.integer.def_long_press_timeout_millis); } finally { if (stmt != null) stmt.close(); } |