diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/AuthenticatorHelper.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/ManageAccountsSettings.java | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 5826154..37b47c2 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -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) 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(); } |