Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca32f1d3 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

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

am: f3c3cd97

Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
parents c215b4ef f3c3cd97

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -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