Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa042de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Misc search summary text updates."

parents 34df520f e05b3527

res/xml/app_default_settings.xml

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
    <Preference

        android:key="default_browser"

        android:title="@string/default_browser_title"

        android:summary="@string/default_browser_title_none"

        android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"

        android:order="-19">

        <extra android:name="for_work" android:value="false"/>
@@ -38,7 +37,6 @@ 
    <Preference

        android:key="default_home"

        android:title="@string/home_app"

        android:summary="@string/no_default_home"

        android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"

        settings:keywords="@string/keywords_home"

        android:order="-18"/>
@@ -66,7 +64,6 @@ 
    <com.android.settings.widget.GearPreference

        android:key="default_autofill"

        android:title="@string/autofill_app"

        android:summary="@string/app_list_preference_none"

        android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

        settings:keywords="@string/autofill_keywords"

        android:order="-14"/>
@@ -91,7 +88,6 @@ 
        <Preference

            android:key="work_default_browser"

            android:title="@string/default_browser_title"

            android:summary="@string/default_browser_title_none"

            android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">

            <extra android:name="for_work" android:value="true"/>

        </Preference>

src/com/android/settings/accessibility/AccessibilitySettings.java

+0 −2
Original line number Diff line number Diff line
@@ -775,8 +775,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
                SearchIndexableRaw indexable = new SearchIndexableRaw(context);

                indexable.key = componentName.flattenToString();

                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;

                indexables.add(indexable);

            }

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

+0 −2
Original line number Diff line number Diff line
@@ -597,8 +597,6 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 
                    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);

                }