From 9e107c56826381d197416a579425349ef55629a1 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Thu, 20 Apr 2017 14:46:28 -0700 Subject: [PATCH] Add EXTRA_FROM_STORAGE to photos gallery intent. Change-Id: I050149f558df0de83e7139354ac54176d7ced162 Fixes: 36991234 Test: Settings robotest --- .../deviceinfo/storage/StorageItemPreferenceController.java | 1 + .../deviceinfo/storage/StorageItemPreferenceControllerTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index 5c4e354710d..31ca148b3f3 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -275,6 +275,7 @@ public class StorageItemPreferenceController extends PreferenceController { intent.setAction(android.content.Intent.ACTION_VIEW); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.setType(IMAGE_MIME_TYPE); + intent.putExtra(Intent.EXTRA_FROM_STORAGE, true); return intent; } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index 2231c22cf2c..47d910d3760 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -114,6 +114,7 @@ public class StorageItemPreferenceControllerTest { Intent intent = argumentCaptor.getValue(); assertThat(intent.getType()).isEqualTo("image/*"); assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW); + assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue(); } @Test