PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back a SYNC_SETTINGS screen

Browse Source 
Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.

Auto-sync data checkbox will also continue to exist in Data Usage.

Minor fixes to account list and account update monitoring.

Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
This commit is contained in:
Amith Yamasani
2012-06-06 20:23:08 -07:00
parent 6a5e0252ce
commit 86708a8a6d
8 changed files with 287 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/AccountPreference.java
View File

@@ -39,16 +39,24 @@ public class AccountPreference extends Preference {
private int mStatus;
private Account mAccount;
private ArrayList<String> mAuthorities;
private ImageView mSyncStatusIcon;
private boolean mShowTypeIcon;
public AccountPreference(Context context, Account account, Drawable icon,
ArrayList<String> authorities) {
ArrayList<String> authorities, boolean showTypeIcon) {
super(context);
mAccount = account;
mAuthorities = authorities;
mShowTypeIcon = showTypeIcon;
if (showTypeIcon) {
setIcon(icon);
} else {
setIcon(getSyncStatusIcon(SYNC_DISABLED));
}
setTitle(mAccount.name);
setSummary("");
setPersistent(false);
setSyncStatus(SYNC_DISABLED);
setSyncStatus(SYNC_DISABLED, false);
}
public Account getAccount() {
@@ -62,16 +70,22 @@ public class AccountPreference extends Preference {
@Override
protected void onBindView(View view) {
super.onBindView(view);
setSummary(getSyncStatusMessage(mStatus));
ImageView iconView = (ImageView) view.findViewById(android.R.id.icon);
iconView.setImageResource(getSyncStatusIcon(mStatus));
iconView.setContentDescription(getSyncContentDescription(mStatus));
if (!mShowTypeIcon) {
mSyncStatusIcon = (ImageView) view.findViewById(android.R.id.icon);
mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
}
}
public void setSyncStatus(int status) {
public void setSyncStatus(int status, boolean updateSummary) {
mStatus = status;
setIcon(getSyncStatusIcon(status));
setSummary(getSyncStatusMessage(status));
if (!mShowTypeIcon && mSyncStatusIcon != null) {
mSyncStatusIcon.setImageResource(getSyncStatusIcon(status));
mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
}
if (updateSummary) {
setSummary(getSyncStatusMessage(status));
}
}
private int getSyncStatusMessage(int status) {
@@ -109,7 +123,7 @@ public class AccountPreference extends Preference {
res = R.drawable.ic_sync_red_holo;
break;
case SYNC_IN_PROGRESS:
res = R.drawable.ic_sync_grey_holo;
res = R.drawable.ic_sync_green_holo;
break;
default:
res = R.drawable.ic_sync_red_holo;