From c8a9317649d59fb3e2fc7540aedba22a53900895 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 8 Jun 2012 13:35:47 -0700 Subject: Exit to Settings when removing the only account for a type. Skip over the ManageAccounts screen which shows the list of accounts for a particular type, if there are no accounts there. Bug: 6630827 Also fix text alignment in top-level of settings. Change-Id: Icd446babc131e7052fc9e95514214fffe6e6e113 --- src/com/android/settings/accounts/AuthenticatorHelper.java | 3 +-- src/com/android/settings/accounts/ManageAccountsSettings.java | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/com/android/settings/accounts') 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 mTypeToAuthDescription = new HashMap(); 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(); } -- cgit v1.1