commit d729029b904d43c5c6d06f1d95004fe35445873d
author Fabrice Di Meglio <fdimeglio@google.com> Tue Jul 01 14:32:03 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue Jul 01 14:32:03 2014 -0700
tree ff04741f9c3a2480426dfbd9b7dbbb5778186e11
parent 299ed6ef8862a31230a59ff9914ec4c1869fffa1

Fix some Dashboard top categories not showing for Search

- fix Date & time / Printing / Security

See bug: #12910134 Implement Search into the Settings App

Change-Id: I7e96eb35a6802fde7589ccfe244e71f8be43dea8

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ea6ece6..781a691 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -380,7 +380,7 @@
 
 
     <!-- Date & time settings screen title -->
-    <string name="date_and_time">Date &amp; time settings</string>
+    <string name="date_and_time">Date &amp; time</string>
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Choose time zone</string>
     <!-- Do not translate. Used as the value for a setting. -->

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 33ad170..940b3e0 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -699,7 +699,10 @@
 
             final String screenTitle = res.getString(R.string.security_settings_title);
 
-            SearchIndexableRaw data;
+            SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.title = screenTitle;
+            data.screenTitle = screenTitle;
+            result.add(data);
 
             if (!mIsPrimary) {
                 int resId = (UserManager.get(context).isLinkedUser()) ?

src/com/android/settings/print/PrintSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index f512db5..f883c7f 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -528,8 +528,12 @@
                     Context.PRINT_SERVICE);
 
             String screenTitle = context.getResources().getString(R.string.print_settings);
+            SearchIndexableRaw data = new SearchIndexableRaw(context);
+            data.title = screenTitle;
+            data.screenTitle = screenTitle;
+            indexables.add(data);
 
-            // Indexing all services, reagardles if enabled.
+            // Indexing all services, regardless if enabled.
             List<PrintServiceInfo> services = printManager.getInstalledPrintServices();
             final int serviceCount = services.size();
             for (int i = 0; i < serviceCount; i++) {
@@ -539,13 +543,13 @@
                         service.getResolveInfo().serviceInfo.packageName,
                         service.getResolveInfo().serviceInfo.name);
 
-                SearchIndexableRaw indexable = new SearchIndexableRaw(context);
-                indexable.key = componentName.flattenToString();
-                indexable.title = service.getResolveInfo().loadLabel(packageManager).toString();
-                indexable.summaryOn = context.getString(R.string.print_feature_state_on);
-                indexable.summaryOff = context.getString(R.string.print_feature_state_off);
-                indexable.screenTitle = screenTitle;
-                indexables.add(indexable);
+                data = new SearchIndexableRaw(context);
+                data.key = componentName.flattenToString();
+                data.title = service.getResolveInfo().loadLabel(packageManager).toString();
+                data.summaryOn = context.getString(R.string.print_feature_state_on);
+                data.summaryOff = context.getString(R.string.print_feature_state_off);
+                data.screenTitle = screenTitle;
+                indexables.add(data);
             }
 
             return indexables;