Use a public media content uri for viewing local media files
Bug: 11061566 Change-Id: I7e049f48d37a68a0a41b7a62383eea71f3938c44
This commit is contained in:
@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo;
|
|||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.app.DialogFragment;
|
import android.app.DialogFragment;
|
||||||
|
import android.content.ActivityNotFoundException;
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
@@ -223,7 +224,11 @@ public class Memory extends SettingsPreferenceFragment {
|
|||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
// Don't go across app boundary if monkey is running
|
// Don't go across app boundary if monkey is running
|
||||||
if (!Utils.isMonkeyRunning()) {
|
if (!Utils.isMonkeyRunning()) {
|
||||||
startActivity(intent);
|
try {
|
||||||
|
startActivity(intent);
|
||||||
|
} catch (ActivityNotFoundException anfe) {
|
||||||
|
Log.w(TAG, "No activity found for intent " + intent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -34,6 +34,7 @@ import android.os.storage.StorageManager;
|
|||||||
import android.os.storage.StorageVolume;
|
import android.os.storage.StorageVolume;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.PreferenceCategory;
|
import android.preference.PreferenceCategory;
|
||||||
|
import android.provider.MediaStore;
|
||||||
import android.text.format.Formatter;
|
import android.text.format.Formatter;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
@@ -437,8 +438,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
|
|||||||
} else if (pref == mItemDcim) {
|
} else if (pref == mItemDcim) {
|
||||||
intent = new Intent(Intent.ACTION_VIEW);
|
intent = new Intent(Intent.ACTION_VIEW);
|
||||||
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
|
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
|
||||||
// TODO Create a Videos category, type = vnd.android.cursor.dir/video
|
// TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI
|
||||||
intent.setType("vnd.android.cursor.dir/image");
|
intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
|
||||||
} else if (pref == mItemMisc) {
|
} else if (pref == mItemMisc) {
|
||||||
Context context = getContext().getApplicationContext();
|
Context context = getContext().getApplicationContext();
|
||||||
intent = new Intent(context, MiscFilesHandler.class);
|
intent = new Intent(context, MiscFilesHandler.class);
|
||||||
|
Reference in New Issue
Block a user