PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show more settings and add restrictions/dialogs for secondary users

Browse Source 
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
This commit is contained in:
Amith Yamasani
2012-09-23 12:54:14 -07:00
parent b105531116
commit 9627a8ea15
16 changed files with 321 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DataUsageSummary.java
View File

@@ -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