diff options
| author | Tom Taylor <tomtaylor@google.com> | 2011-11-10 11:17:38 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2011-11-10 11:17:38 -0800 |
| commit | 994da2ad3242407fd822e6b35e3d302a3667d9c3 (patch) | |
| tree | bfa07f7cb460593e29ab3acdc6a76270ce8d5b92 /packages | |
| parent | 843e04d977fd348ed474da1d3c6a62e7dc837444 (diff) | |
| download | frameworks_base-994da2ad3242407fd822e6b35e3d302a3667d9c3.zip frameworks_base-994da2ad3242407fd822e6b35e3d302a3667d9c3.tar.gz frameworks_base-994da2ad3242407fd822e6b35e3d302a3667d9c3.tar.bz2 | |
Revert "Add new secure setting for controlling Messaging notifications"
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.
Committer: Tom Taylor <tomtaylor@google.com>
On branch revertsetting
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: api/current.txt
modified: core/java/android/provider/Settings.java
modified: core/java/android/provider/Telephony.java
modified: packages/SettingsProvider/res/values/defaults.xml
modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.
Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
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(); } |