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

VPN settings: grey out policy-restricted menus

Browse Source 
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.

Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
This commit is contained in:
Robin Lee
2015-10-16 12:37:59 +01:00
parent bb7eeadecc
commit 4198607ee2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -129,6 +129,11 @@ public class VpnSettings extends SettingsPreferenceFragment implements
public void onPrepareOptionsMenu(Menu menu) { public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
// Disable all actions if VPN configuration has been disallowed
for (int i = 0; i < menu.size(); i++) {
menu.getItem(i).setEnabled(!mUnavailable);
}
// Hide lockdown VPN on devices that require IMS authentication // Hide lockdown VPN on devices that require IMS authentication
if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) { if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {
menu.findItem(R.id.vpn_lockdown).setVisible(false); menu.findItem(R.id.vpn_lockdown).setVisible(false);