diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-01 21:41:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-01 14:50:43 +0000 |
| commit | 706ad94c5cb63884a4ce6cbfd1a29e132fb523db (patch) | |
| tree | e38bd7d9623226ecf1159828f9bc646b0f3b3607 | |
| parent | 3ef3a02e47c819cf3e97eb1a67307158ce733a37 (diff) | |
| parent | d729029b904d43c5c6d06f1d95004fe35445873d (diff) | |
| download | packages_apps_Settings-706ad94c5cb63884a4ce6cbfd1a29e132fb523db.zip packages_apps_Settings-706ad94c5cb63884a4ce6cbfd1a29e132fb523db.tar.gz packages_apps_Settings-706ad94c5cb63884a4ce6cbfd1a29e132fb523db.tar.bz2 | |
Merge "Fix some Dashboard top categories not showing for Search"
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/print/PrintSettingsFragment.java | 20 |
3 files changed, 17 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index cc9a8df..dabb721 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 & time settings</string> + <string name="date_and_time">Date & 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. --> 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 @@ public class SecuritySettings extends SettingsPreferenceFragment 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()) ? 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 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment 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 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment 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; |