Fix accessibility for account sync

[android-x86/packages-apps-Settings.git] / src / com / android / settings / accounts / AccountSyncSettings.java

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 382fa33..d1df82a 100644 (file)
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accounts;
 
+import com.android.internal.logging.MetricsLogger;
 import com.google.android.collect.Lists;
 
 import android.accounts.Account;
@@ -141,8 +142,15 @@ public class AccountSyncSettings extends AccountPreferenceBase {
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        setPreferenceScreen(null);
+        addPreferencesFromResource(R.xml.account_sync_settings);
 
         setHasOptionsMenu(true);
     }
@@ -161,8 +169,6 @@ public class AccountSyncSettings extends AccountPreferenceBase {
     }
 
     protected void initializeUi(final View rootView) {
-        addPreferencesFromResource(R.xml.account_sync_settings);
-
         mErrorInfoView = (TextView) rootView.findViewById(R.id.sync_settings_error_info);
         mErrorInfoView.setVisibility(View.GONE);
 
@@ -196,6 +202,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
 
     @Override
     public void onResume() {
+        removePreference("dummy");
         mAuthenticatorHelper.listenToAccountUpdates();
         updateAuthDescriptions();
         onAccountsUpdate(UserHandle.getCallingUserHandle());
@@ -534,7 +541,6 @@ public class AccountSyncSettings extends AccountPreferenceBase {
             mProviderIcon.setImageDrawable(getDrawableForType(mAccount.type));
             mProviderId.setText(getLabelForType(mAccount.type));
         }
-        addPreferencesFromResource(R.xml.account_sync_settings);
     }
 
     @Override