Merge "Launch the Gallery app to manage photos from the Storage screen." (6596c8ff) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ public class StorageItemPreferenceController extends PreferenceController
		implements StorageMeasurement.MeasurementReceiver, LifecycleObserver, OnDestroy {
		private static final String TAG = "StorageItemPreference";

		private static final String IMAGE_MIME_TYPE = "image/*";
		@VisibleForTesting
		static final String PHOTO_KEY = "pref_photos_videos";
		@VisibleForTesting
		@@ -233,9 +234,10 @@ public class StorageItemPreferenceController extends PreferenceController
		}

		private Intent getPhotosIntent() {
		Intent intent = new Intent(DocumentsContract.ACTION_BROWSE);
		intent.setData(DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"));
		intent.addCategory(Intent.CATEGORY_DEFAULT);
		Intent intent = new Intent();
		intent.setAction(android.content.Intent.ACTION_VIEW);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
		intent.setType(IMAGE_MIME_TYPE);
		return intent;
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -106,10 +106,8 @@ public class StorageItemPreferenceControllerTest {
		any(UserHandle.class));

		Intent intent = argumentCaptor.getValue();
		assertThat(intent.getAction()).isEqualTo(DocumentsContract.ACTION_BROWSE);
		assertThat(intent.getData()).isEqualTo(DocumentsContract.buildRootUri(
		"com.android.providers.media.documents",
		"images_root"));
		assertThat(intent.getType()).isEqualTo("image/*");
		assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
		}

		@Test