diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-06-08 13:35:47 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-06-08 15:21:05 -0700 |
| commit | c8a9317649d59fb3e2fc7540aedba22a53900895 (patch) | |
| tree | 2bf274a4edd682aa8246af3c74ec737cb2278d49 /src/com/android/settings/Settings.java | |
| parent | b3a049f5392da8500befaf2595f5170cf04cc432 (diff) | |
| download | packages_apps_Settings-c8a9317649d59fb3e2fc7540aedba22a53900895.tar.gz packages_apps_Settings-c8a9317649d59fb3e2fc7540aedba22a53900895.tar.bz2 packages_apps_Settings-c8a9317649d59fb3e2fc7540aedba22a53900895.zip | |
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
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 582615433..37b47c2c4 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) |