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

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

Merge "Remove DocumentsContract.ACTION_BROWSE."

parents 32fc8615 2d01be10

src/com/android/settings/applications/MusicViewHolderController.java

+4 −2
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ public class MusicViewHolderController implements FileViewHolderController { 


    @Override

    public void onClick(Fragment fragment) {

        Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);

        intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"));

        Intent intent = new Intent(Intent.ACTION_VIEW);

        intent.setDataAndType(

                DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),

                DocumentsContract.Root.MIME_TYPE_ITEM);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.putExtra(Intent.EXTRA_USER_ID, mUser);

        Utils.launchIntent(fragment, intent);

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

+12 −6
Original line number Diff line number Diff line
@@ -483,20 +483,26 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 


            } break;

            case R.string.storage_detail_images: {

                intent = new Intent(DocumentsContract.ACTION_BROWSE);

                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"));

                intent = new Intent(Intent.ACTION_VIEW);

                intent.setDataAndType(

                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"),

                        DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.addCategory(Intent.CATEGORY_DEFAULT);



            } break;

            case R.string.storage_detail_videos: {

                intent = new Intent(DocumentsContract.ACTION_BROWSE);

                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"));

                intent = new Intent(Intent.ACTION_VIEW);

                intent.setDataAndType(

                        DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"),

                        DocumentsContract.Root.MIME_TYPE_ITEM);

                intent.addCategory(Intent.CATEGORY_DEFAULT);



            } break;

            case R.string.storage_detail_audio: {

                intent = new Intent(DocumentsContract.ACTION_BROWSE);

                intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"));

                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);



            } break;

tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -99,9 +99,10 @@ public class MusicViewHolderControllerTest { 
        verify(mFragment).startActivity(argumentCaptor.capture());

        Intent intent = argumentCaptor.getValue();



        assertThat(intent.getAction()).isEqualTo(DocumentsContract.ACTION_BROWSE);

        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);

        assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(

                "com.android.providers.media.documents",

                "audio_root"));

        assertThat(intent.getType()).isEqualTo(DocumentsContract.Root.MIME_TYPE_ITEM);

    }

}