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

Merge "Made changes to menu items in WifiSettings and AccountSyncSettings."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-01-27 15:15:29 +00:00
committed by Android (Google) Code Review
parent ce71ae91e5 7ff7ea1e7f
commit 6a83d7537d
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -270,9 +270,13 @@ public class AccountSyncSettings extends AccountPreferenceBase {
.setIcon(R.drawable.ic_menu_delete); .setIcon(R.drawable.ic_menu_delete);
removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
MenuItem.SHOW_AS_ACTION_WITH_TEXT); MenuItem.SHOW_AS_ACTION_WITH_TEXT);
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced( EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS, getPrefContext(), UserManager.DISALLOW_MODIFY_ACCOUNTS,
mUserHandle.getIdentifier()); mUserHandle.getIdentifier());
if (admin == null) {
admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
getPrefContext(), mAccount.type);
}
RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(), RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
removeAccount, admin); removeAccount, admin);
syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |

13
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -158,6 +158,8 @@ public class WifiSettings extends RestrictedSettingsFragment
private AccessPointPreference.UserBadgeCache mUserBadgeCache; private AccessPointPreference.UserBadgeCache mUserBadgeCache;
private Preference mAddPreference; private Preference mAddPreference;
private MenuItem mScanMenuItem;
/* End of "used in Wifi Setup context" */ /* End of "used in Wifi Setup context" */
public WifiSettings() { public WifiSettings() {
@@ -324,6 +326,7 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
mWifiTracker.startTracking(); mWifiTracker.startTracking();
activity.invalidateOptionsMenu();
} }
@Override @Override
@@ -350,8 +353,8 @@ public class WifiSettings extends RestrictedSettingsFragment
*/ */
void addOptionsMenuItems(Menu menu) { void addOptionsMenuItems(Menu menu) {
final boolean wifiIsEnabled = mWifiTracker.isWifiEnabled(); final boolean wifiIsEnabled = mWifiTracker.isWifiEnabled();
menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.menu_stats_refresh) mScanMenuItem = menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.menu_stats_refresh);
.setEnabled(wifiIsEnabled) mScanMenuItem.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced) menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
@@ -689,6 +692,9 @@ public class WifiSettings extends RestrictedSettingsFragment
getPreferenceScreen().addPreference(mAddPreference); getPreferenceScreen().addPreference(mAddPreference);
setProgressBarVisible(false); setProgressBarVisible(false);
} }
if (mScanMenuItem != null) {
mScanMenuItem.setEnabled(true);
}
break; break;
case WifiManager.WIFI_STATE_ENABLING: case WifiManager.WIFI_STATE_ENABLING:
@@ -704,6 +710,9 @@ public class WifiSettings extends RestrictedSettingsFragment
case WifiManager.WIFI_STATE_DISABLED: case WifiManager.WIFI_STATE_DISABLED:
setOffMessage(); setOffMessage();
setProgressBarVisible(false); setProgressBarVisible(false);
if (mScanMenuItem != null) {
mScanMenuItem.setEnabled(false);
}
break; break;
} }
} }