Add account sync summary.
- Check for the number of sync adapter that is enabled for the account and update the summary text for the account sync preference accordingly. - Add divider above the Remove Account button. Bug: 62862167 Test: make RunSettingsRoboTests Change-Id: Ic333f62cce9aed0a72771324976ebe3d8e586287
This commit is contained in:
@@ -19,25 +19,32 @@ package com.android.settings.accounts;
|
||||
import static android.content.Intent.EXTRA_USER;
|
||||
|
||||
import android.accounts.Account;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.SyncAdapterType;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserHandle;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.accounts.AuthenticatorHelper;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
public class AccountSyncPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener {
|
||||
|
||||
private static final String TAG = "AccountSyncController";
|
||||
private static final String KEY_ACCOUNT_SYNC = "account_sync";
|
||||
|
||||
private Account mAccount;
|
||||
private UserHandle mUserHandle;
|
||||
private AuthenticatorHelper mAuthenticatorHelper;
|
||||
private Preference mPreference;
|
||||
|
||||
public AccountSyncPreferenceController(Context context) {
|
||||
super(context);
|
||||
@@ -67,8 +74,64 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle
|
||||
return KEY_ACCOUNT_SYNC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
updateSummary(preference);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAccountsUpdate(UserHandle userHandle) {
|
||||
updateSummary(mPreference);
|
||||
}
|
||||
|
||||
public void init(Account account, UserHandle userHandle) {
|
||||
mAccount = account;
|
||||
mUserHandle = userHandle;
|
||||
mAuthenticatorHelper = new AuthenticatorHelper(mContext, mUserHandle, this);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void updateSummary(Preference preference) {
|
||||
if (mAccount == null) {
|
||||
return;
|
||||
}
|
||||
final int userId = mUserHandle.getIdentifier();
|
||||
final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(userId);
|
||||
int total = 0;
|
||||
int enabled = 0;
|
||||
if (syncAdapters != null) {
|
||||
for (int i = 0, n = syncAdapters.length; i < n; i++) {
|
||||
final SyncAdapterType sa = syncAdapters[i];
|
||||
if (!sa.accountType.equals(mAccount.type) || !sa.isUserVisible()) {
|
||||
continue;
|
||||
}
|
||||
final int syncState =
|
||||
ContentResolver.getIsSyncableAsUser(mAccount, sa.authority, userId);
|
||||
if (syncState > 0) {
|
||||
total++;
|
||||
final boolean syncEnabled = ContentResolver.getSyncAutomaticallyAsUser(
|
||||
mAccount, sa.authority, userId);
|
||||
final boolean oneTimeSyncMode =
|
||||
!ContentResolver.getMasterSyncAutomaticallyAsUser(userId);
|
||||
if (oneTimeSyncMode || syncEnabled) {
|
||||
enabled++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (enabled == 0) {
|
||||
preference.setSummary(R.string.account_sync_summary_all_off);
|
||||
} else if (enabled == total) {
|
||||
preference.setSummary(R.string.account_sync_summary_all_on);
|
||||
} else {
|
||||
preference.setSummary(
|
||||
mContext.getString(R.string.account_sync_summary_some_on, enabled, total));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user