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

Commit 1dc3f385 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Add "Free up space" to the Settings search." into oc-dr1-dev

parents bacb9fc4 0808bdc5

res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -108,4 +108,9 @@ 
    <!-- Whether or not App & Notification screen should display recently used apps -->

    <bool name="config_display_recent_apps">true</bool>



    <!-- Package name for the storage manager to use from Settings search. -->

    <string name="config_deletion_helper_package" translatable="false">com.android.storagemanager</string>

    <!-- Class name for the storage manager's deletion helper class. -->

    <string name="config_deletion_helper_class" translatable="false">com.android.storagemanager.deletionhelper.DeletionHelperActivity</string>



</resources>

src/com/android/settings/deviceinfo/StorageSettings.java

+80 −70
Original line number Diff line number Diff line
@@ -549,13 +549,12 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index 
        }

    };



    /**

     * Enable indexing of searchable data

     */

    /** Enable indexing of searchable data */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {

                public List<SearchIndexableRaw> getRawDataToIndex(

                        Context context, boolean enabled) {

                    final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();



                    SearchIndexableRaw data = new SearchIndexableRaw(context);
@@ -619,6 +618,17 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index 
                    data.screenTitle = context.getString(R.string.storage_settings);

                    result.add(data);



                    data = new SearchIndexableRaw(context);

                    data.title = context.getString(R.string.storage_menu_free);

                    data.screenTitle = context.getString(R.string.storage_menu_free);

                    // We need to define all three in order for this to trigger properly.

                    data.intentAction = StorageManager.ACTION_MANAGE_STORAGE;

                    data.intentTargetPackage =

                            context.getString(R.string.config_deletion_helper_package);

                    data.intentTargetClass =

                            context.getString(R.string.config_deletion_helper_class);

                    result.add(data);



                    return result;

                }

            };