diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-25 16:19:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-25 16:19:23 -0700 |
| commit | f59dd9d67e269a81c684ecd641e514aba8d2330a (patch) | |
| tree | 3069afbdb1db9a58360b319635ffe26abe35c920 /res | |
| parent | 40b78280eb0c93d9ee3918813cfabf93a2919f35 (diff) | |
| parent | ef57ed71bf390858cb83253bd193a192bb48346c (diff) | |
| download | packages_apps_Settings-f59dd9d67e269a81c684ecd641e514aba8d2330a.zip packages_apps_Settings-f59dd9d67e269a81c684ecd641e514aba8d2330a.tar.gz packages_apps_Settings-f59dd9d67e269a81c684ecd641e514aba8d2330a.tar.bz2 | |
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 41d562f..744a814 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4099,4 +4099,9 @@ <string name="help_url_backup_reset" translatable="false"></string> <!-- Help URL, Tethering [DO NOT TRANSLATE] --> <string name="help_url_tether" translatable="false"></string> + + <!-- Cell Broadcast settings title [CHAR LIMIT=50] --> + <string name="cell_broadcast_settings">Cell broadcasts</string> + <!-- Cell Broadcast settings description [CHAR LIMIT=100] --> + <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string> </resources> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 866a617..3cd72b3 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -75,4 +75,14 @@ android:key="proxy_settings" android:title="@string/proxy_settings_title" /> + <PreferenceScreen + android:key="cell_broadcast_settings" + android:title="@string/cell_broadcast_settings" + android:summary="@string/cell_broadcast_settings_summary" > + <intent + android:action="android.intent.action.MAIN" + android:targetPackage="com.android.cellbroadcastreceiver" + android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" /> + </PreferenceScreen> + </PreferenceScreen> |