Reorganize sync state menu options for accounts settings

Fixes inverted condition for displaying the buttons, updates
at the right time and removes the useless dependence on mFirstAccount

Bug: 18310988
Change-Id: Id55e11a210aa58a10ee9613891470862d42b65ad
This commit is contained in:
Alexandra Gherghina
2014-11-11 11:47:54 +00:00
parent 095521b287
commit b2d9795cda
2 changed files with 9 additions and 10 deletions

View File

@@ -258,7 +258,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
public void onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
// Note that this also counts accounts that are not currently displayed
boolean syncActive = ContentResolver.getCurrentSyncsAsUser(
boolean syncActive = !ContentResolver.getCurrentSyncsAsUser(
mUserHandle.getIdentifier()).isEmpty();
menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
@@ -367,6 +367,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
protected void onSyncStateUpdated() {
if (!isResumed()) return;
setFeedsState();
getActivity().invalidateOptionsMenu();
}
private void setFeedsState() {