summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-07-09 17:52:31 -0700
committerJeff Sharkey <jsharkey@android.com>2011-07-09 17:52:42 -0700
commit9fab0da184b07f7a355909d84429a8ea41985e74 (patch)
treee816ad2a10f47f18d44e55f2db7b08132a0f0d94 /res/menu
parent9f81ee87ef8c0c0de184aedff7b09bbf6007a078 (diff)
downloadpackages_apps_Settings-9fab0da184b07f7a355909d84429a8ea41985e74.zip
packages_apps_Settings-9fab0da184b07f7a355909d84429a8ea41985e74.tar.gz
packages_apps_Settings-9fab0da184b07f7a355909d84429a8ea41985e74.tar.bz2
Roaming and background controls under data usage.
Add action items to control mobile data roaming and background data controls, along with dialogs to confirm. Still need to fix telephony to watch for Settings.Secure changes. Hide "Change cycle" item when viewing app details. Handle special case where data usage doesn't want split action bar. Bug: 4818009, 4979025, 4948767, 5010948 Change-Id: I363ff76a9daf2528d81573cf8d0687719d664bb0
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/data_usage.xml12
1 files changed, 10 insertions, 2 deletions
diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
index a95c074..ae18231 100644
--- a/res/menu/data_usage.xml
+++ b/res/menu/data_usage.xml
@@ -21,11 +21,19 @@
android:showAsAction="always">
<menu>
<item
- android:id="@+id/action_split_4g"
+ android:id="@+id/data_usage_menu_roaming"
+ android:title="@string/data_usage_menu_roaming"
+ android:checkable="true" />
+ <item
+ android:id="@+id/data_usage_menu_restrict_background"
+ android:title="@string/data_usage_menu_restrict_background"
+ android:checkable="true" />
+ <item
+ android:id="@+id/data_usage_menu_split_4g"
android:title="@string/data_usage_menu_split_4g"
android:checkable="true" />
<item
- android:id="@+id/action_show_wifi"
+ android:id="@+id/data_usage_menu_show_wifi"
android:title="@string/data_usage_menu_show_wifi"
android:checkable="true" />
</menu>