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

Commit 5f5592cd authored by Nick Deakin's avatar Nick Deakin Committed by Automerger Merge Worker
Browse files

Merge "SilkFX: enable sharing to the app." into udc-dev am: 1f1c22fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22994901



Change-Id: Id92c245de8ef6af1085926f4ac01f19aa67ef176
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a8bf2f3 1f1c22fc

tests/SilkFX/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ 
                <category android:name="android.intent.category.DEFAULT"/>

                <data android:mimeType="image/*"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.SEND" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="image/*" />

            </intent-filter>

        </activity>



    </application>

tests/SilkFX/src/com/android/test/silkfx/app/HdrImageViewer.kt

+18 −9
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package com.android.test.silkfx.app 


import android.content.Intent

import android.graphics.ImageDecoder

import android.net.Uri

import android.os.Bundle

import android.os.Parcelable

import com.android.test.silkfx.R

import com.android.test.silkfx.hdr.GainmapImage
@@ -29,14 +31,21 @@ class HdrImageViewer : BaseDemoActivity() { 
        setContentView(R.layout.hdr_image_viewer)



        val intent = this.intent ?: return finish()

        if (Intent.ACTION_VIEW != intent.action) {

            finish()

            return

        }



        when (intent.action) {

            Intent.ACTION_VIEW -> {

                val data = intent.data ?: return finish()



                val source = ImageDecoder.createSource(contentResolver, data)

                findViewById<GainmapImage>(R.id.gainmap_image)!!.setImageSource(source)

            }

            Intent.ACTION_SEND -> {

                val uri = (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)

                    ?: return finish()

                val source = ImageDecoder.createSource(contentResolver, uri)

                findViewById<GainmapImage>(R.id.gainmap_image)!!.setImageSource(source)

            }

            else -> {

                finish()

            }

        }

    }

}