diff options
author | Jason Monk <jmonk@google.com> | 2015-06-25 15:03:26 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2015-06-25 15:06:00 -0400 |
commit | fb6e1186ab0b967acf0a041dc0d2d6ea96c672b9 (patch) | |
tree | 9f1c2d8f9a7fa4f73faa3240a66871f2151b73ea /src/com/android/settings/accounts | |
parent | 91ba69df7e0fd7c3cc594e16a1d97339f769da09 (diff) | |
download | packages_apps_Settings-fb6e1186ab0b967acf0a041dc0d2d6ea96c672b9.zip packages_apps_Settings-fb6e1186ab0b967acf0a041dc0d2d6ea96c672b9.tar.gz packages_apps_Settings-fb6e1186ab0b967acf0a041dc0d2d6ea96c672b9.tar.bz2 |
Fix accessibility for account sync
Needed to get views recycling so that feedback could occur during
switch turning off.
Bug: 20020216
Change-Id: Ib7b1cdca78f5ac5064cdf521122ff7a5ee49f572
Diffstat (limited to 'src/com/android/settings/accounts')
-rw-r--r-- | src/com/android/settings/accounts/AccountSyncSettings.java | 6 | ||||
-rw-r--r-- | src/com/android/settings/accounts/SyncStateSwitchPreference.java | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 2de8e4a..d1df82a 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -149,6 +149,8 @@ public class AccountSyncSettings extends AccountPreferenceBase { @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); + setPreferenceScreen(null); + addPreferencesFromResource(R.xml.account_sync_settings); setHasOptionsMenu(true); } @@ -167,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); @@ -202,6 +202,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { @Override public void onResume() { + removePreference("dummy"); mAuthenticatorHelper.listenToAccountUpdates(); updateAuthDescriptions(); onAccountsUpdate(UserHandle.getCallingUserHandle()); @@ -540,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 diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index 4d63870..fd0c45c 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -23,6 +23,7 @@ import android.preference.SwitchPreference; import android.util.AttributeSet; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import com.android.settings.R; @@ -43,17 +44,15 @@ public class SyncStateSwitchPreference extends SwitchPreference { private boolean mOneTimeSyncMode = false; public SyncStateSwitchPreference(Context context, AttributeSet attrs) { - super(context, attrs); - setWidgetLayoutResource(R.layout.preference_widget_sync_toggle); + super(context, attrs, 0, R.style.SyncSwitchPreference); mAccount = null; mAuthority = null; } public SyncStateSwitchPreference(Context context, Account account, String authority) { - super(context, null); + super(context, null, 0, R.style.SyncSwitchPreference); mAccount = account; mAuthority = authority; - setWidgetLayoutResource(R.layout.preference_widget_sync_toggle); } @Override |