diff options
author | Amith Yamasani <yamasani@google.com> | 2012-06-08 15:30:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-08 15:30:58 -0700 |
commit | f595a2b884794f4bfcb8c2d458eb2a4f73615514 (patch) | |
tree | 3f02096ca4f15c014d7931bb85913a1001f61fc5 /src/com/android/settings/accounts | |
parent | ab45c75a3a91fae900e17204baf54e16532abf9f (diff) | |
parent | 450c4c86ca6583abc27520174d0f51b8f171f4a3 (diff) | |
download | packages_apps_settings-f595a2b884794f4bfcb8c2d458eb2a4f73615514.zip packages_apps_settings-f595a2b884794f4bfcb8c2d458eb2a4f73615514.tar.gz packages_apps_settings-f595a2b884794f4bfcb8c2d458eb2a4f73615514.tar.bz2 |
am 450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev
* commit '450c4c86ca6583abc27520174d0f51b8f171f4a3':
Exit to Settings when removing the only account for a type.
Diffstat (limited to 'src/com/android/settings/accounts')
-rw-r--r-- | src/com/android/settings/accounts/AuthenticatorHelper.java | 3 | ||||
-rw-r--r-- | src/com/android/settings/accounts/ManageAccountsSettings.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java index ab2fe74..eba785b 100644 --- a/src/com/android/settings/accounts/AuthenticatorHelper.java +++ b/src/com/android/settings/accounts/AuthenticatorHelper.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.graphics.drawable.ScaleDrawable; import android.util.Log; import java.util.ArrayList; @@ -32,7 +31,7 @@ import java.util.Map; public class AuthenticatorHelper { - private static final String TAG = "AccountTypesHelper"; + private static final String TAG = "AuthenticatorHelper"; private Map<String, AuthenticatorDescription> mTypeToAuthDescription = new HashMap<String, AuthenticatorDescription>(); private AuthenticatorDescription[] mAuthDescs; diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java index bb1ebdd..a27fbbd 100644 --- a/src/com/android/settings/accounts/ManageAccountsSettings.java +++ b/src/com/android/settings/accounts/ManageAccountsSettings.java @@ -333,6 +333,11 @@ public class ManageAccountsSettings extends AccountPreferenceBase } if (mAccountType != null && mFirstAccount != null) { addAuthenticatorSettings(); + } else { + // There's no account, reset to top-level of settings + Intent settingsTop = new Intent(android.provider.Settings.ACTION_SETTINGS); + settingsTop.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + getActivity().startActivity(settingsTop); } onSyncStateUpdated(); } |