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

am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo

Browse Source 
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
This commit is contained in:
Mike LeBeau
2010-04-16 07:27:34 -07:00
committed by Android Git Automerger
parent 32ebaf57d8 0c5ad4f1b3
commit f04be52a38
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,6 +302,20 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
} else {
text2 = getStringOrNull(cursor, mText2Col);
}
// If no second line of text is indicated, allow the first line of text
// to be up to two lines if it wants to be.
if (TextUtils.isEmpty(text2)) {
if (views.mText1 != null) {
views.mText1.setSingleLine(false);
views.mText1.setMaxLines(2);
}
} else {
if (views.mText1 != null) {
views.mText1.setSingleLine(true);
views.mText1.setMaxLines(1);
}
}
setViewText(views.mText2, text2);
}