PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

4
src/com/android/settings/Settings.java
View File

@@ -625,9 +625,9 @@ public class Settings extends PreferenceActivity
case HEADER_TYPE_NORMAL:
view = mInflater.inflate(
com.android.internal.R.layout.preference_header_item, parent,
R.layout.preference_header_item, parent,
false);
holder.icon = (ImageView) view.findViewById(com.android.internal.R.id.icon);
holder.icon = (ImageView) view.findViewById(R.id.icon);
holder.title = (TextView)
view.findViewById(com.android.internal.R.id.title);
holder.summary = (TextView)

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