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

Commit 66871d85 authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

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

parents b1c336de 973cddcb

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

+13 −18
Original line number Diff line number Diff line
@@ -484,28 +484,13 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 


            } break;

            case R.string.storage_detail_images: {

                intent = new Intent(Intent.ACTION_VIEW);

                intent.setDataAndType(

                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"),

                        DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.addCategory(Intent.CATEGORY_DEFAULT);



                intent = getIntentForStorage(AUTHORITY_MEDIA, "images_root");

            } break;

            case R.string.storage_detail_videos: {

                intent = new Intent(Intent.ACTION_VIEW);

                intent.setDataAndType(

                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"),

                        DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.addCategory(Intent.CATEGORY_DEFAULT);



                intent = getIntentForStorage(AUTHORITY_MEDIA, "videos_root");

            } break;

            case R.string.storage_detail_audio: {

                intent = new Intent(DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.setDataAndType(

                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),

                        DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.addCategory(Intent.CATEGORY_DEFAULT);



                intent = getIntentForStorage(AUTHORITY_MEDIA, "audio_root");

            } break;

            case R.string.storage_detail_system: {

                SystemInfoFragment.show(this);
@@ -546,6 +531,16 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
        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() {

        @Override

        public void onDetailsChanged(MeasurementDetails details) {