diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-11-10 21:16:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:16:54 +0000 |
| commit | fb894276b127767e610fc99cc4539c397c4e7ecc (patch) | |
| tree | 6e52fa6e6ee5995360198bacfa5e320f0c51579d /packages | |
| parent | dce3af33a53c15f5fe290b0de4e126eb5b2d883f (diff) | |
| parent | 0bbd151e1dab043226725d23f0ca26f4d09ee76f (diff) | |
| download | frameworks_base-fb894276b127767e610fc99cc4539c397c4e7ecc.zip frameworks_base-fb894276b127767e610fc99cc4539c397c4e7ecc.tar.gz frameworks_base-fb894276b127767e610fc99cc4539c397c4e7ecc.tar.bz2 | |
am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
Revert "Add new secure setting for controlling Messaging notifications"
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 | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 0891525..7a98615 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -133,8 +133,4 @@ <bool name="def_dtmf_tones_enabled">true</bool> <!-- Default for UI touch sounds enabled --> <bool name="def_sound_effects_enabled">true</bool> - - <!-- Default for Messaging app notifications enabled --> - <bool name="def_messaging_app_notifications_on">true</bool> - </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 44194f0..5495d08 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1472,10 +1472,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED, R.bool.def_touch_exploration_enabled); - - loadBooleanSetting(stmt, Settings.Secure.MESSAGING_APP_NOTIFICATIONS, - R.bool.def_messaging_app_notifications_on); - } finally { if (stmt != null) stmt.close(); } |