commit b7390ba5854c0f583858e085bff89eebe307eb39
author Fabrice Di Meglio <fdimeglio@google.com> Mon Apr 21 16:37:39 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Mon Apr 21 16:40:48 2014 -0700
tree c9ad5a0c958c2a954379e9db655d5f3ea61d7991
parent 63609c58a0ae857cc6ec62d28d73e2a0fb8241e9

Fix missing summary for CheckBoxPreference

- "summaryOn" and "summaryOff" were parsed but we were missing
also "summary"

Repro case: search for "adt" (from Developer options)

Change-Id: Ifa829ec6c6f86cb426432f716c2d28df8550f9ea

src/com/android/settings/search/Index.java

diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index 6f91981..4f5aa2c 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -761,8 +761,12 @@
                             keywords, intentAction, intentTargetPackage, intentTargetClass,
                             true, key);
                 } else {
-                    final String summaryOn = getDataSummaryOn(context, attrs);
-                    final String summaryOff = getDataSummaryOff(context, attrs);
+                    String summaryOn = getDataSummaryOn(context, attrs);
+                    String summaryOff = getDataSummaryOff(context, attrs);
+
+                    if (TextUtils.isEmpty(summaryOn) && TextUtils.isEmpty(summaryOff)) {
+                        summaryOn = getDataSummary(context, attrs);
+                    }
 
                     updateOneRowWithFilteredData(database, localeStr, title, summaryOn, summaryOff,
                             null, fragmentName, screenTitle, iconResId, rank,