Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev

am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad
This commit is contained in:
Fyodor Kupolov
2016-06-28 23:14:39 +00:00
committed by android-build-merger
4 changed files with 42 additions and 2 deletions

View File

@@ -1063,6 +1063,13 @@ public class SettingsActivity extends SettingsDrawerActivity
UserHandle.MU_ENABLED && UserManager.supportsMultipleUsers()
&& !Utils.isMonkeyRunning(), isAdmin, pm);
setTileEnabled(new ComponentName(packageName,
Settings.WirelessSettingsActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin, pm);
setTileEnabled(new ComponentName(packageName,
Settings.DateTimeSettingsActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin, pm);
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
setTileEnabled(new ComponentName(packageName,
Settings.PaymentSettingsActivity.class.getName()),