app_Settings

Go to file

Sudheer Shanka 7ff7ea1e7f Made changes to menu items in WifiSettings and AccountSyncSettings.

When the admin has set disallow_config_wifi, menu items are not added.
we need to check if the menu items can be added after this fragment is
resumed. And for remove account menuitem, check whether any admin has
disabled management of a specific account type.

Change-Id: I58f5a59fe0614c9bc7068b15f43f89527939359d

2016-01-27 14:08:44 +00:00

res

resolve merge conflicts of 55d7fcbfc2 to master.

2016-01-27 00:34:53 +00:00

src/com/android/settings

Made changes to menu items in WifiSettings and AccountSyncSettings.

2016-01-27 14:08:44 +00:00

tests

Merge "Add SmallTest annotation to UserCredentialsTest"

2016-01-26 09:30:49 +00:00

Android.mk

resolve merge conflicts of bdc6074276 to master.