Merge branch 'readonly-p4-donut' into donut

This commit is contained in:
Bjorn Bringert
2009-04-24 02:59:00 -07:00
committed by The Android Open Source Project

View File

@@ -150,9 +150,12 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
@Override
public void bindView(View view, Context context, Cursor cursor) {
ChildViewCache views = (ChildViewCache) view.getTag();
String format = cursor.getString(mFormatCol);
boolean isHtml = "html".equals(format);
ChildViewCache views = (ChildViewCache) view.getTag();
boolean isHtml = false;
if (mFormatCol >= 0) {
String format = cursor.getString(mFormatCol);
isHtml = "html".equals(format);
}
setViewText(cursor, views.mText1, mText1Col, isHtml);
setViewText(cursor, views.mText2, mText2Col, isHtml);
setViewIcon(cursor, views.mIcon1, mIconBitmap1Col, mIconName1Col);