Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Bjorn Bringert
2009-04-24 02:59:00 -07:00
committed by The Android Open Source Project
parent 96a98d61d7 4369397d06
commit 7fc4b28175
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/SuggestionsAdapter.java
View File

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