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

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

Browse Source
This commit is contained in:
Amith Yamasani
2013-10-04 22:58:05 +00:00
committed by Android (Google) Code Review
parent 0a9d037bed c778bc560d
commit 4a4a1b8b96
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -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()) {
startActivity(intent);
try {
startActivity(intent);
} catch (ActivityNotFoundException anfe) {
Log.w(TAG, "No activity found for intent " + intent);
}
}
return true;
}

5
src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
View File

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