diff options
Diffstat (limited to 'src/com/android/settings/accounts/AccountSettings.java')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSettings.java | 89 |
1 files changed, 8 insertions, 81 deletions
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java index 88f47bc..13878d7 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -19,9 +19,7 @@ package com.android.settings.accounts; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActivityManager; import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -31,11 +29,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; import android.util.SparseArray; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceGroup; @@ -60,6 +54,7 @@ public class AccountSettings extends SettingsPreferenceFragment implements AuthenticatorHelper.OnAccountsUpdateListener, OnPreferenceClickListener { public static final String TAG = "AccountSettings"; + private static final String KEY_ACCOUNT = "account"; private static final String KEY_ADD_ACCOUNT = "add_account"; @@ -73,7 +68,6 @@ public class AccountSettings extends SettingsPreferenceFragment private UserManager mUm; private SparseArray<ProfileData> mProfiles; private ManagedProfileBroadcastReceiver mManagedProfileBroadcastReceiver; - private boolean mIsSingleProfileUi = true; /** * Holds data related to the accounts belonging to one profile. @@ -103,50 +97,6 @@ public class AccountSettings extends SettingsPreferenceFragment mUm = (UserManager) getSystemService(Context.USER_SERVICE); mProfiles = new SparseArray<ProfileData>(2); updateUi(); - setHasOptionsMenu(true); - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.account_settings, menu); - final UserHandle currentProfile = UserHandle.getCallingUserHandle(); - if (mIsSingleProfileUi) { - menu.findItem(R.id.account_settings_menu_auto_sync) - .setVisible(true) - .setOnMenuItemClickListener(new MasterSyncStateClickListener(currentProfile)); - menu.removeItem(R.id.account_settings_menu_auto_sync_personal); - menu.removeItem(R.id.account_settings_menu_auto_sync_work); - } else { - final UserHandle managedProfile = Utils.getManagedProfile(mUm); - - menu.findItem(R.id.account_settings_menu_auto_sync_personal) - .setVisible(true) - .setOnMenuItemClickListener(new MasterSyncStateClickListener(currentProfile)); - menu.findItem(R.id.account_settings_menu_auto_sync_work) - .setVisible(true) - .setOnMenuItemClickListener(new MasterSyncStateClickListener(managedProfile)); - menu.removeItem(R.id.account_settings_menu_auto_sync); - } - super.onCreateOptionsMenu(menu, inflater); - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - final UserHandle currentProfile = UserHandle.getCallingUserHandle(); - if (mIsSingleProfileUi) { - menu.findItem(R.id.account_settings_menu_auto_sync) - .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser( - currentProfile.getIdentifier())); - } else { - final UserHandle managedProfile = Utils.getManagedProfile(mUm); - - menu.findItem(R.id.account_settings_menu_auto_sync_personal) - .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser( - currentProfile.getIdentifier())); - menu.findItem(R.id.account_settings_menu_auto_sync_work) - .setChecked(ContentResolver.getMasterSyncAutomaticallyAsUser( - managedProfile.getIdentifier())); - } } void updateUi() { @@ -167,13 +117,12 @@ public class AccountSettings extends SettingsPreferenceFragment if (managedProfile == null) { updateSingleProfileUi(); } else { - mIsSingleProfileUi = false; - updateProfileUi(currentProfile, KEY_CATEGORY_PERSONAL, KEY_ADD_ACCOUNT_PERSONAL, - new ArrayList<String>()); - final ArrayList<String> unusedPreferences = new ArrayList<String>(2); + updateProfileUi(currentProfile, + KEY_CATEGORY_PERSONAL, KEY_ADD_ACCOUNT_PERSONAL, new ArrayList<String>()); + final ArrayList<String> unusedPreferences = new ArrayList<String>(1); unusedPreferences.add(KEY_ADD_ACCOUNT); - updateProfileUi(managedProfile, KEY_CATEGORY_WORK, KEY_ADD_ACCOUNT_WORK, - unusedPreferences); + updateProfileUi(managedProfile, + KEY_CATEGORY_WORK, KEY_ADD_ACCOUNT_WORK, unusedPreferences); mManagedProfileBroadcastReceiver = new ManagedProfileBroadcastReceiver(); mManagedProfileBroadcastReceiver.register(getActivity()); } @@ -192,8 +141,8 @@ public class AccountSettings extends SettingsPreferenceFragment unusedPreferences); } - private void updateProfileUi(final UserHandle userHandle, String categoryKey, - String addAccountKey, ArrayList<String> unusedPreferences) { + private void updateProfileUi(UserHandle userHandle, String categoryKey, String addAccountKey, + ArrayList<String> unusedPreferences) { final int count = unusedPreferences.size(); for (int i = 0; i < count; i++) { removePreference(unusedPreferences.get(i)); @@ -396,28 +345,6 @@ public class AccountSettings extends SettingsPreferenceFragment } } } - - private class MasterSyncStateClickListener implements MenuItem.OnMenuItemClickListener { - private final UserHandle mUserHandle; - - public MasterSyncStateClickListener(UserHandle userHandle) { - mUserHandle = userHandle; - } - - @Override - public boolean onMenuItemClick(MenuItem item) { - // TODO: Add confirmation dialogs. See: http://b/16076571 - if (ActivityManager.isUserAMonkey()) { - Log.d(TAG, "ignoring monkey's attempt to flip sync state"); - } else { - boolean newSyncState = !item.isChecked(); - item.setChecked(newSyncState); - ContentResolver.setMasterSyncAutomaticallyAsUser(newSyncState, - mUserHandle.getIdentifier()); - } - return true; - } - } // TODO Implement a {@link SearchIndexProvider} to allow Indexing and Search of account types // See http://b/15403806 } |