Misc search summary text updates.

- Remove static text from default app summaries.They will be filled
dynamically at runtime, so we don't need the static ones here.
- Remove summaryOn/summaryOff strings from a few fragments. Search
framework does not need them.

Change-Id: I165766073ba70aceead88c3df02d62f3700e4592
Fix: 36474747
Fix: 34573952
Test: run existing tests
This commit is contained in:
Fan Zhang
2017-03-21 14:13:18 -07:00
parent 320d60f0ad
commit e05b352758
3 changed files with 0 additions and 8 deletions

View File

@@ -29,7 +29,6 @@
<Preference <Preference
android:key="default_browser" android:key="default_browser"
android:title="@string/default_browser_title" android:title="@string/default_browser_title"
android:summary="@string/default_browser_title_none"
android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker" android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
android:order="-19"> android:order="-19">
<extra android:name="for_work" android:value="false"/> <extra android:name="for_work" android:value="false"/>
@@ -38,7 +37,6 @@
<Preference <Preference
android:key="default_home" android:key="default_home"
android:title="@string/home_app" android:title="@string/home_app"
android:summary="@string/no_default_home"
android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker" android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
settings:keywords="@string/keywords_home" settings:keywords="@string/keywords_home"
android:order="-18"/> android:order="-18"/>
@@ -66,7 +64,6 @@
<com.android.settings.widget.GearPreference <com.android.settings.widget.GearPreference
android:key="default_autofill" android:key="default_autofill"
android:title="@string/autofill_app" android:title="@string/autofill_app"
android:summary="@string/app_list_preference_none"
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker" android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
settings:keywords="@string/autofill_keywords" settings:keywords="@string/autofill_keywords"
android:order="-14"/> android:order="-14"/>
@@ -91,7 +88,6 @@
<Preference <Preference
android:key="work_default_browser" android:key="work_default_browser"
android:title="@string/default_browser_title" android:title="@string/default_browser_title"
android:summary="@string/default_browser_title_none"
android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"> android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
<extra android:name="for_work" android:value="true"/> <extra android:name="for_work" android:value="true"/>
</Preference> </Preference>

View File

@@ -775,8 +775,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
SearchIndexableRaw indexable = new SearchIndexableRaw(context); SearchIndexableRaw indexable = new SearchIndexableRaw(context);
indexable.key = componentName.flattenToString(); indexable.key = componentName.flattenToString();
indexable.title = service.getResolveInfo().loadLabel(packageManager).toString(); indexable.title = service.getResolveInfo().loadLabel(packageManager).toString();
indexable.summaryOn = context.getString(R.string.accessibility_feature_state_on);
indexable.summaryOff = context.getString(R.string.accessibility_feature_state_off);
indexable.screenTitle = screenTitle; indexable.screenTitle = screenTitle;
indexables.add(indexable); indexables.add(indexable);
} }

View File

@@ -597,8 +597,6 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
data.key = componentName.flattenToString(); data.key = componentName.flattenToString();
data.title = service.getResolveInfo().loadLabel(packageManager).toString(); 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; data.screenTitle = screenTitle;
indexables.add(data); indexables.add(data);
} }