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

Commit 4a4a1b8b authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Use a public media content uri for viewing local media files" into klp-dev

parents 0a9d037b c778bc56

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

+6 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; 
import android.app.AlertDialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.content.ActivityNotFoundException;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.DialogInterface;
@@ -223,7 +224,11 @@ public class Memory extends SettingsPreferenceFragment { 
            if (intent != null) {

                // Don't go across app boundary if monkey is running

                if (!Utils.isMonkeyRunning()) {

                    try {

                        startActivity(intent);

                    } catch (ActivityNotFoundException anfe) {

                        Log.w(TAG, "No activity found for intent " + intent);

                    }

                }

                return true;

            }

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

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.storage.StorageManager; 
import android.os.storage.StorageVolume;

import android.preference.Preference;

import android.preference.PreferenceCategory;

import android.provider.MediaStore;

import android.text.format.Formatter;



import com.android.settings.R;
@@ -437,8 +438,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory { 
        } else if (pref == mItemDcim) {

            intent = new Intent(Intent.ACTION_VIEW);

            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);

            // TODO Create a Videos category, type = vnd.android.cursor.dir/video

            intent.setType("vnd.android.cursor.dir/image");

            // TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI

            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);

        } else if (pref == mItemMisc) {

            Context context = getContext().getApplicationContext();

            intent = new Intent(context, MiscFilesHandler.class);