Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 450c4c86: Merge "Exit to Settings when removing the only account for a type." into jb-dev

Browse Source 
* commit '450c4c86ca6583abc27520174d0f51b8f171f4a3':
  Exit to Settings when removing the only account for a type.
This commit is contained in:
Amith Yamasani
2012-06-08 15:30:58 -07:00
committed by Android Git Automerger
parent ab45c75a3a 450c4c86ca
commit f595a2b884
5 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accounts/AuthenticatorHelper.java
View File

@@ -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;

5
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -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();
}