Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fee638e authored by Mike LeBeau's avatar Mike LeBeau Committed by Android Git Automerger
Browse files

am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog,... 

am f04be52a: 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

Merge commit 'f04be52a' into kraken

* commit 'f04be52a':
  For search suggestions in the search dialog, allow the 'title'
parents 48b8b4fd f04be52a

core/java/android/app/SuggestionsAdapter.java

+14 −0
Original line number Diff line number Diff line
@@ -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);

        }