Jason Monk 84f544a2ae resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp ...

Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc

2016-06-08 15:28:48 -04:00

..

AccountPreferenceBase.java

Move AnimatedImageView and AuthenticatorHelper to SettingsLib

2015-11-17 15:13:29 -08:00

AccountSettings.java

More theming fixes.

2016-05-25 10:55:11 -07:00

AccountSyncSettings.java

Cache account prefs so we don't lose a11y focus

2016-06-01 17:19:01 +00:00

AddAccountSettings.java

Remove PreferenceActivity

2016-06-08 09:48:58 -04:00

ChooseAccountActivity.java

Remove PreferenceActivity

2016-06-08 09:48:58 -04:00

ManageAccountsSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

ManagedProfileSettings.java

Add managed profile setting page

2016-05-03 18:55:41 +01:00

ProviderPreference.java

Use the correct userId when checking if disabled by admin.

2016-02-02 20:31:48 +00:00

SyncStateSwitchPreference.java

Cache account prefs so we don't lose a11y focus

2016-06-01 17:19:01 +00:00