diff options
17 files changed, 2 insertions, 2 deletions
diff --git a/tests/SilkFX/assets/gainmaps/cave.jpg b/tests/SilkFX/assets/gainmaps/cave.jpg Binary files differdeleted file mode 100644 index fa7d3fc325d5..000000000000 --- a/tests/SilkFX/assets/gainmaps/cave.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/city_night.jpg b/tests/SilkFX/assets/gainmaps/city_night.jpg Binary files differnew file mode 100644 index 000000000000..cdb4311ddcbe --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/city_night.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_palms.jpg b/tests/SilkFX/assets/gainmaps/desert_palms.jpg Binary files differnew file mode 100644 index 000000000000..c337aadc2d4d --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_palms.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_sunset.jpg b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg Binary files differnew file mode 100644 index 000000000000..fa15f5606af6 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg diff --git a/tests/SilkFX/assets/gainmaps/desert_wanda.jpg b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg Binary files differnew file mode 100644 index 000000000000..33f69a92bac3 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg diff --git a/tests/SilkFX/assets/gainmaps/fountain_night.jpg b/tests/SilkFX/assets/gainmaps/fountain_night.jpg Binary files differnew file mode 100644 index 000000000000..863127b7ac59 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/fountain_night.jpg diff --git a/tests/SilkFX/assets/gainmaps/grand_canyon.jpg b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg Binary files differnew file mode 100644 index 000000000000..12cd9665776e --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg diff --git a/tests/SilkFX/assets/gainmaps/granddam.jpg b/tests/SilkFX/assets/gainmaps/granddam.jpg Binary files differdeleted file mode 100644 index 823f14efcbb2..000000000000 --- a/tests/SilkFX/assets/gainmaps/granddam.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/lamps.jpg b/tests/SilkFX/assets/gainmaps/lamps.jpg Binary files differnew file mode 100644 index 000000000000..65bda89ad660 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/lamps.jpg diff --git a/tests/SilkFX/assets/gainmaps/lightbulb.jpg b/tests/SilkFX/assets/gainmaps/lightbulb.jpg Binary files differdeleted file mode 100644 index 232c5f0937df..000000000000 --- a/tests/SilkFX/assets/gainmaps/lightbulb.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/mountain_lake.jpg b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg Binary files differnew file mode 100644 index 000000000000..b2b10d287c69 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg diff --git a/tests/SilkFX/assets/gainmaps/mountains.jpg b/tests/SilkFX/assets/gainmaps/mountains.jpg Binary files differnew file mode 100644 index 000000000000..82acd45fc0d8 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/mountains.jpg diff --git a/tests/SilkFX/assets/gainmaps/porsche911.jpg b/tests/SilkFX/assets/gainmaps/porsche911.jpg Binary files differdeleted file mode 100644 index 50f4fc83910e..000000000000 --- a/tests/SilkFX/assets/gainmaps/porsche911.jpg +++ /dev/null diff --git a/tests/SilkFX/assets/gainmaps/sunflower.jpg b/tests/SilkFX/assets/gainmaps/sunflower.jpg Binary files differnew file mode 100644 index 000000000000..55b1b14c0ff4 --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/sunflower.jpg diff --git a/tests/SilkFX/assets/gainmaps/train_station_night.jpg b/tests/SilkFX/assets/gainmaps/train_station_night.jpg Binary files differnew file mode 100644 index 000000000000..45142bb326ee --- /dev/null +++ b/tests/SilkFX/assets/gainmaps/train_station_night.jpg diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt index db812ace0d85..a004fb5a4305 100644 --- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt +++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt @@ -38,7 +38,7 @@ class GainmapDecodeTest(context: Context, attrs: AttributeSet?) : LinearLayout(c private fun decode(mode: DecodeMode) { val source = ImageDecoder.createSource(resources.assets, - "gainmaps/cave.jpg") + "gainmaps/${context.assets.list("gainmaps")!![0]}") val sourceInfo = findViewById<TextView>(R.id.source_info)!! diff --git a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt index e079b6d5e4db..78bc4c45fa4f 100644 --- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt +++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt @@ -92,7 +92,7 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context } } - setImage(gainmapImages.indexOf("cave.jpg")) + setImage(0) imageView.apply { isClickable = true |