diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 468c622..13ee460 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/sync_failed" />
 
-    <com.android.settings.widget.AnimatedImageView
+    <com.android.settingslib.widget.AnimatedImageView
         android:id="@+id/sync_active"
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 6bb5b28..65d5887 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -37,6 +37,7 @@
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -66,7 +67,7 @@
         final Activity activity = getActivity();
         mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(), mUm, getArguments(),
                 activity.getIntent().getExtras());
-        mAuthenticatorHelper = new AuthenticatorHelper(activity, mUserHandle, mUm, this);
+        mAuthenticatorHelper = new AuthenticatorHelper(activity, mUserHandle, this);
     }
 
     /**
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 2f47eb7..3942fbb 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -59,6 +59,7 @@
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.users.UserDialogs;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -297,7 +298,7 @@
         }
         if (userInfo.isEnabled()) {
             profileData.authenticatorHelper = new AuthenticatorHelper(context,
-                    userInfo.getUserHandle(), mUm, this);
+                    userInfo.getUserHandle(), this);
             if (!mUm.hasUserRestriction(DISALLOW_MODIFY_ACCOUNTS, userInfo.getUserHandle())) {
                 profileData.addAccountPreference = newAddAccountPreference(context);
             }
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
deleted file mode 100644
index a0ded04..0000000
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SyncAdapterType;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.Log;
-
-import com.google.android.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Helper class for monitoring accounts on the device for a given user.
- *
- * Classes using this helper should implement {@link OnAccountsUpdateListener}.
- * {@link OnAccountsUpdateListener#onAccountsUpdate(UserHandle)} will then be
- * called once accounts get updated. For setting up listening for account
- * updates, {@link #listenToAccountUpdates()} and
- * {@link #stopListeningToAccountUpdates()} should be used.
- */
-final public class AuthenticatorHelper extends BroadcastReceiver {
-    private static final String TAG = "AuthenticatorHelper";
-
-    private Map<String, AuthenticatorDescription> mTypeToAuthDescription
-            = new HashMap<String, AuthenticatorDescription>();
-    private AuthenticatorDescription[] mAuthDescs;
-    private ArrayList<String> mEnabledAccountTypes = new ArrayList<String>();
-    private Map<String, Drawable> mAccTypeIconCache = new HashMap<String, Drawable>();
-    private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = Maps.newHashMap();
-
-    private final UserHandle mUserHandle;
-    private final UserManager mUm;
-    private final Context mContext;
-    private final OnAccountsUpdateListener mListener;
-    private boolean mListeningToAccountUpdates;
-
-    public interface OnAccountsUpdateListener {
-        void onAccountsUpdate(UserHandle userHandle);
-    }
-
-    public AuthenticatorHelper(Context context, UserHandle userHandle, UserManager userManager,
-            OnAccountsUpdateListener listener) {
-        mContext = context;
-        mUm = userManager;
-        mUserHandle = userHandle;
-        mListener = listener;
-        // This guarantees that the helper is ready to use once constructed: the account types and
-        // authorities are initialized
-        onAccountsUpdated(null);
-    }
-
-    public String[] getEnabledAccountTypes() {
-        return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
-    }
-
-    public void preloadDrawableForType(final Context context, final String accountType) {
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                getDrawableForType(context, accountType);
-                return null;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-    }
-
-    /**
-     * Gets an icon associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return a drawable for the icon or a default icon returned by
-     * {@link PackageManager#getDefaultActivityIcon} if one cannot be found.
-     */
-    public Drawable getDrawableForType(Context context, final String accountType) {
-        Drawable icon = null;
-        synchronized (mAccTypeIconCache) {
-            if (mAccTypeIconCache.containsKey(accountType)) {
-                return mAccTypeIconCache.get(accountType);
-            }
-        }
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            try {
-                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
-                        mUserHandle);
-                icon = mContext.getPackageManager().getUserBadgedIcon(
-                        authContext.getDrawable(desc.iconId), mUserHandle);
-                synchronized (mAccTypeIconCache) {
-                    mAccTypeIconCache.put(accountType, icon);
-                }
-            } catch (PackageManager.NameNotFoundException e) {
-            } catch (Resources.NotFoundException e) {
-            }
-        }
-        if (icon == null) {
-            icon = context.getPackageManager().getDefaultActivityIcon();
-        }
-        return icon;
-    }
-
-    /**
-     * Gets the label associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return a CharSequence for the label or null if one cannot be found.
-     */
-    public CharSequence getLabelForType(Context context, final String accountType) {
-        CharSequence label = null;
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            try {
-                AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-                Context authContext = context.createPackageContextAsUser(desc.packageName, 0,
-                        mUserHandle);
-                label = authContext.getResources().getText(desc.labelId);
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label name for account type " + accountType);
-            } catch (Resources.NotFoundException e) {
-                Log.w(TAG, "No label icon for account type " + accountType);
-            }
-        }
-        return label;
-    }
-
-    /**
-     * Gets the package associated with a particular account type. If none found, return null.
-     * @param accountType the type of account
-     * @return the package name or null if one cannot be found.
-     */
-    public String getPackageForType(final String accountType) {
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-            return desc.packageName;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the resource id of the label associated with a particular account type. If none found,
-     * return -1.
-     * @param accountType the type of account
-     * @return a resource id for the label or -1 if none found;
-     */
-    public int getLabelIdForType(final String accountType) {
-        if (mTypeToAuthDescription.containsKey(accountType)) {
-            AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
-            return desc.labelId;
-        }
-        return -1;
-    }
-
-    /**
-     * Updates provider icons. Subclasses should call this in onCreate()
-     * and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
-     */
-    public void updateAuthDescriptions(Context context) {
-        mAuthDescs = AccountManager.get(context)
-                .getAuthenticatorTypesAsUser(mUserHandle.getIdentifier());
-        for (int i = 0; i < mAuthDescs.length; i++) {
-            mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
-        }
-    }
-
-    public boolean containsAccountType(String accountType) {
-        return mTypeToAuthDescription.containsKey(accountType);
-    }
-
-    public AuthenticatorDescription getAccountTypeDescription(String accountType) {
-        return mTypeToAuthDescription.get(accountType);
-    }
-
-    public boolean hasAccountPreferences(final String accountType) {
-        if (containsAccountType(accountType)) {
-            AuthenticatorDescription desc = getAccountTypeDescription(accountType);
-            if (desc != null && desc.accountPreferencesId != 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void onAccountsUpdated(Account[] accounts) {
-        updateAuthDescriptions(mContext);
-        if (accounts == null) {
-            accounts = AccountManager.get(mContext).getAccountsAsUser(mUserHandle.getIdentifier());
-        }
-        mEnabledAccountTypes.clear();
-        mAccTypeIconCache.clear();
-        for (int i = 0; i < accounts.length; i++) {
-            final Account account = accounts[i];
-            if (!mEnabledAccountTypes.contains(account.type)) {
-                mEnabledAccountTypes.add(account.type);
-            }
-        }
-        buildAccountTypeToAuthoritiesMap();
-        if (mListeningToAccountUpdates) {
-            mListener.onAccountsUpdate(mUserHandle);
-        }
-    }
-
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        // TODO: watch for package upgrades to invalidate cache; see http://b/7206643
-        final Account[] accounts = AccountManager.get(mContext)
-                .getAccountsAsUser(mUserHandle.getIdentifier());
-        onAccountsUpdated(accounts);
-    }
-
-    public void listenToAccountUpdates() {
-        if (!mListeningToAccountUpdates) {
-            IntentFilter intentFilter = new IntentFilter();
-            intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
-            // At disk full, certain actions are blocked (such as writing the accounts to storage).
-            // It is useful to also listen for recovery from disk full to avoid bugs.
-            intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
-            mContext.registerReceiverAsUser(this, mUserHandle, intentFilter, null, null);
-            mListeningToAccountUpdates = true;
-        }
-    }
-
-    public void stopListeningToAccountUpdates() {
-        if (mListeningToAccountUpdates) {
-            mContext.unregisterReceiver(this);
-            mListeningToAccountUpdates = false;
-        }
-    }
-
-    public ArrayList<String> getAuthoritiesForAccountType(String type) {
-        return mAccountTypeToAuthorities.get(type);
-    }
-
-    private void buildAccountTypeToAuthoritiesMap() {
-        mAccountTypeToAuthorities.clear();
-        SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(
-                mUserHandle.getIdentifier());
-        for (int i = 0, n = syncAdapters.length; i < n; i++) {
-            final SyncAdapterType sa = syncAdapters[i];
-            ArrayList<String> authorities = mAccountTypeToAuthorities.get(sa.accountType);
-            if (authorities == null) {
-                authorities = new ArrayList<String>();
-                mAccountTypeToAuthorities.put(sa.accountType, authorities);
-            }
-            if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                Log.d(TAG, "Added authority " + sa.authority + " to accountType "
-                        + sa.accountType);
-            }
-            authorities.add(sa.authority);
-        }
-    }
-}
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index c9124d9..d2f9174 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -51,6 +51,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.location.LocationSettings;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
index eefde07..34663e6 100644
--- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java
+++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -27,7 +27,7 @@
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.widget.AnimatedImageView;
+import com.android.settingslib.widget.AnimatedImageView;
 
 public class SyncStateSwitchPreference extends SwitchPreference {
 
diff --git a/src/com/android/settings/widget/AnimatedImageView.java b/src/com/android/settings/widget/AnimatedImageView.java
deleted file mode 100644
index 671d718..0000000
--- a/src/com/android/settings/widget/AnimatedImageView.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.graphics.drawable.AnimatedRotateDrawable;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-
-public class AnimatedImageView extends ImageView {
-    private AnimatedRotateDrawable mDrawable;
-    private boolean mAnimating;
-
-    public AnimatedImageView(Context context) {
-        super(context);
-    }
-
-    public AnimatedImageView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    private void updateDrawable() {
-        if (isShown() && mDrawable != null) {
-            mDrawable.stop();
-        }
-        final Drawable drawable = getDrawable();
-        if (drawable instanceof AnimatedRotateDrawable) {
-            mDrawable = (AnimatedRotateDrawable) drawable;
-            // TODO: define in drawable xml once we have public attrs.
-            mDrawable.setFramesCount(56);
-            mDrawable.setFramesDuration(32);
-            if (isShown() && mAnimating) {
-                mDrawable.start();
-            }
-        } else {
-            mDrawable = null;
-        }
-    }
-
-    private void updateAnimating() {
-        if (mDrawable != null) {
-            if (isShown() && mAnimating) {
-                mDrawable.start();
-            } else {
-                mDrawable.stop();
-            }
-        }
-    }
-
-    @Override
-    public void setImageDrawable(Drawable drawable) {
-        super.setImageDrawable(drawable);
-        updateDrawable();
-    }
-
-    @Override
-    public void setImageResource(int resid) {
-        super.setImageResource(resid);
-        updateDrawable();
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        updateAnimating();
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        updateAnimating();
-    }
-
-    public void setAnimating(boolean animating) {
-        mAnimating = animating;
-        updateAnimating();
-    }
-
-    @Override
-    protected void onVisibilityChanged(View changedView, int vis) {
-        super.onVisibilityChanged(changedView, vis);
-        updateAnimating();
-    }
-}