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

Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-04-21 17:18:04 +00:00
committed by Android (Google) Code Review
parent 9e89d528f6 9e107c5682
commit bad8171d05
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -275,6 +275,7 @@ public class StorageItemPreferenceController extends PreferenceController {
intent.setAction(android.content.Intent.ACTION_VIEW); intent.setAction(android.content.Intent.ACTION_VIEW);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
intent.setType(IMAGE_MIME_TYPE); intent.setType(IMAGE_MIME_TYPE);
intent.putExtra(Intent.EXTRA_FROM_STORAGE, true);
return intent; return intent;
} }

1
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
View File

@@ -114,6 +114,7 @@ public class StorageItemPreferenceControllerTest {
Intent intent = argumentCaptor.getValue(); Intent intent = argumentCaptor.getValue();
assertThat(intent.getType()).isEqualTo("image/*"); assertThat(intent.getType()).isEqualTo("image/*");
assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW); assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
} }
@Test @Test