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

Merge "Fix the intent to launch storage details." into oc-dev

Browse Source
This commit is contained in:
Garfield Tan
2017-04-10 20:24:19 +00:00
committed by Android (Google) Code Review
parent b1c336de5f 973cddcb1b
commit 66871d8531
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -484,28 +484,13 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
} break; } break;
case R.string.storage_detail_images: { case R.string.storage_detail_images: {
intent = new Intent(Intent.ACTION_VIEW); intent = getIntentForStorage(AUTHORITY_MEDIA, "images_root");
intent.setDataAndType(
DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"),
DocumentsContract.Root.MIME_TYPE_ITEM);
intent.addCategory(Intent.CATEGORY_DEFAULT);
} break; } break;
case R.string.storage_detail_videos: { case R.string.storage_detail_videos: {
intent = new Intent(Intent.ACTION_VIEW); intent = getIntentForStorage(AUTHORITY_MEDIA, "videos_root");
intent.setDataAndType(
DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"),
DocumentsContract.Root.MIME_TYPE_ITEM);
intent.addCategory(Intent.CATEGORY_DEFAULT);
} break; } break;
case R.string.storage_detail_audio: { case R.string.storage_detail_audio: {
intent = new Intent(DocumentsContract.Root.MIME_TYPE_ITEM); intent = getIntentForStorage(AUTHORITY_MEDIA, "audio_root");
intent.setDataAndType(
DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
DocumentsContract.Root.MIME_TYPE_ITEM);
intent.addCategory(Intent.CATEGORY_DEFAULT);
} break; } break;
case R.string.storage_detail_system: { case R.string.storage_detail_system: {
SystemInfoFragment.show(this); SystemInfoFragment.show(this);
@@ -546,6 +531,16 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
return super.onPreferenceTreeClick(pref); return super.onPreferenceTreeClick(pref);
} }
private Intent getIntentForStorage(String authority, String root) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(
DocumentsContract.buildRootUri(authority, root),
DocumentsContract.Root.MIME_TYPE_ITEM);
intent.addCategory(Intent.CATEGORY_DEFAULT);
return intent;
}
private final MeasurementReceiver mReceiver = new MeasurementReceiver() { private final MeasurementReceiver mReceiver = new MeasurementReceiver() {
@Override @Override
public void onDetailsChanged(MeasurementDetails details) { public void onDetailsChanged(MeasurementDetails details) {