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

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

Browse Source
This commit is contained in:
Daniel Nishi
2017-06-09 17:56:50 +00:00
committed by Android (Google) Code Review
parent bacb9fc459 0808bdc5da
commit 1dc3f38506
2 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/config.xml
View File

@@ -108,4 +108,9 @@
<!-- Whether or not App & Notification screen should display recently used apps --> <!-- Whether or not App & Notification screen should display recently used apps -->
<bool name="config_display_recent_apps">true</bool> <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> </resources>

144
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -549,77 +549,87 @@ 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 = public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() { new BaseSearchIndexProvider() {
@Override @Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) { public List<SearchIndexableRaw> getRawDataToIndex(
final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>(); Context context, boolean enabled) {
final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
SearchIndexableRaw data = new SearchIndexableRaw(context); SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.storage_settings); data.title = context.getString(R.string.storage_settings);
data.screenTitle = context.getString(R.string.storage_settings); data.screenTitle = context.getString(R.string.storage_settings);
result.add(data); result.add(data);
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.internal_storage); data.title = context.getString(R.string.internal_storage);
data.screenTitle = context.getString(R.string.storage_settings); data.screenTitle = context.getString(R.string.storage_settings);
result.add(data); result.add(data);
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
final StorageManager storage = context.getSystemService(StorageManager.class); final StorageManager storage = context.getSystemService(StorageManager.class);
final List<VolumeInfo> vols = storage.getVolumes(); final List<VolumeInfo> vols = storage.getVolumes();
for (VolumeInfo vol : vols) { for (VolumeInfo vol : vols) {
if (isInteresting(vol)) { if (isInteresting(vol)) {
data.title = storage.getBestVolumeDescription(vol); data.title = storage.getBestVolumeDescription(vol);
data.screenTitle = context.getString(R.string.storage_settings); data.screenTitle = context.getString(R.string.storage_settings);
result.add(data); result.add(data);
}
} }
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_size);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_available);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_apps_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_dcim_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_music_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_downloads_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_media_cache_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_media_misc_usage);
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;
} }
};
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_size);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_available);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_apps_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_dcim_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_music_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_downloads_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_media_cache_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_media_misc_usage);
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
return result;
}
};
} }