diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-23 12:54:14 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-09-23 18:43:31 -0700 |
| commit | 9627a8ea151c1f27e5e9f34592c7b34fea3101c3 (patch) | |
| tree | 3c92cd339e0df9ae47ac4ab92964d9b5aab36c10 /src/com/android/settings/DataUsageSummary.java | |
| parent | b105531116148d5d29e113e611ac180aa9691c6e (diff) | |
| download | packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.zip packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.gz packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.bz2 | |
Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Diffstat (limited to 'src/com/android/settings/DataUsageSummary.java')
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 8d51e10..90c3460 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -452,7 +452,6 @@ public class DataUsageSummary extends Fragment { mMenuDataRoaming = menu.findItem(R.id.data_usage_menu_roaming); mMenuDataRoaming.setVisible(hasReadyMobileRadio(context) && !appDetailMode); mMenuDataRoaming.setChecked(getDataRoaming()); - mMenuDataRoaming.setVisible(isOwner); mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background); mMenuRestrictBackground.setVisible(hasReadyMobileRadio(context) && !appDetailMode); @@ -485,7 +484,7 @@ public class DataUsageSummary extends Fragment { final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered); if (hasReadyMobileRadio(context) || hasWifiRadio(context)) { - metered.setVisible(isOwner && !appDetailMode); + metered.setVisible(!appDetailMode); } else { metered.setVisible(false); } @@ -1936,7 +1935,11 @@ public class DataUsageSummary extends Fragment { final AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.roaming_reenable_title); - builder.setMessage(R.string.roaming_warning); + if (Utils.hasMultipleUsers(context)) { + builder.setMessage(R.string.roaming_warning_multiuser); + } else { + builder.setMessage(R.string.roaming_warning); + } builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override @@ -1972,7 +1975,11 @@ public class DataUsageSummary extends Fragment { final AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.data_usage_restrict_background_title); - builder.setMessage(getString(R.string.data_usage_restrict_background)); + if (Utils.hasMultipleUsers(context)) { + builder.setMessage(R.string.data_usage_restrict_background_multiuser); + } else { + builder.setMessage(R.string.data_usage_restrict_background); + } builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override |