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

Merge "Fix bug #13440372 More option is displayed with Email/Gmail icon after... scrolling through settings options"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-03-13 21:17:21 +00:00
committed by Android (Google) Code Review
parent fa066b9c1a 8dcea48d71
commit 7e74b409aa
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/SettingsActivity.java
View File

@@ -1580,9 +1580,6 @@ public class SettingsActivity extends Activity
view.findViewById(com.android.internal.R.id.summary); view.findViewById(com.android.internal.R.id.summary);
break; break;
} }
if (holder.mIcon != null) {
holder.mIcon.setBackgroundResource(R.color.background_drawer_icon);
}
view.setTag(holder); view.setTag(holder);
} else { } else {
view = convertView; view = convertView;
@@ -1650,7 +1647,18 @@ public class SettingsActivity extends Activity
Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType); Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
setHeaderIcon(holder, icon); setHeaderIcon(holder, icon);
} else { } 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())); holder.mTitle.setText(header.getTitle(getContext().getResources()));
CharSequence summary = header.getSummary(getContext().getResources()); CharSequence summary = header.getSummary(getContext().getResources());