PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some Dashboard top categories not showing for Search"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-01 21:41:09 +00:00
committed by Android (Google) Code Review
parent 3ef3a02e47 d729029b90
commit 706ad94c5c
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -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. -->

5
src/com/android/settings/SecuritySettings.java
View File

@@ -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()) ?

20
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -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;