diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-03-13 21:17:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-13 21:17:21 +0000 |
| commit | 7e74b409aabaf5d69b770ba18d75fdedc14b1b26 (patch) | |
| tree | fbb1bd5e5b8319c521c3d193697d6793fcbc9aa2 | |
| parent | fa066b9c1a0b0204c5b6df48845e2be20cdb49d8 (diff) | |
| parent | 8dcea48d7193b052b0ed039c0cbfe99f81237daa (diff) | |
| download | packages_apps_Settings-7e74b409aabaf5d69b770ba18d75fdedc14b1b26.zip packages_apps_Settings-7e74b409aabaf5d69b770ba18d75fdedc14b1b26.tar.gz packages_apps_Settings-7e74b409aabaf5d69b770ba18d75fdedc14b1b26.tar.bz2 | |
Merge "Fix bug #13440372 More option is displayed with Email/Gmail icon after... scrolling through settings options"
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 4c1d698..e49d827 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1580,9 +1580,6 @@ public class SettingsActivity extends Activity view.findViewById(com.android.internal.R.id.summary); break; } - if (holder.mIcon != null) { - holder.mIcon.setBackgroundResource(R.color.background_drawer_icon); - } view.setTag(holder); } else { view = convertView; @@ -1650,7 +1647,18 @@ public class SettingsActivity extends Activity Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType); setHeaderIcon(holder, icon); } else { - holder.mIcon.setImageResource(header.iconRes); + if (header.iconRes > 0) { + holder.mIcon.setImageResource(header.iconRes); + } else { + holder.mIcon.setImageDrawable(null); + } + } + if (holder.mIcon != null) { + if (header.iconRes > 0) { + holder.mIcon.setBackgroundResource(R.color.background_drawer_icon); + } else { + holder.mIcon.setBackground(null); + } } holder.mTitle.setText(header.getTitle(getContext().getResources())); CharSequence summary = header.getSummary(getContext().getResources()); |