summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2019-06-27 14:55:29 -0700
committerBob Badour <bbadour@google.com>2019-06-27 14:57:44 -0700
commit20f89c9907d9afd2be1338aaf486607ee7327fa4 (patch)
tree570107f059e8307b7d632db853a3cdf66464222c
parent9db70d29a1c4afe097215b6e34f60c7d9504192b (diff)
Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0 license applies to the affected .jpg files now and retroactively from the time of import. Usage terms updated with exiftool: $ exiftool -UsageTerms='Apache License Version 2.0' \ frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg 1 image files updated $ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \ frameworks/base/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg Usage Terms : Apache License Version 2.0 Rights : Romain Guy Creator : Romain Guy $ exiftool -UsageTerms='Apache License Version 2.0' \ frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg Warning: [minor] Fixed incorrect list type for XMP-xmpRights:UsageTerms - frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg 1 image files updated $ exiftool -URL -WebStatement -UsageTerms -Rights -Creator \ frameworks/base/tests/UiBench/res/drawable-nodpi/frantic.jpg Usage Terms : Apache License Version 2.0 Rights : Romain Guy Creator : Romain Guy Test: doesn't really apply to images Change-Id: I3b9503efab871600512840531b477d3226432d58
-rw-r--r--tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpgbin1781694 -> 1781132 bytes
-rw-r--r--tests/UiBench/res/drawable-nodpi/frantic.jpgbin192345 -> 191940 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg b/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
index 7f047b1098e7..6e1a866dfb00 100644
--- a/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
+++ b/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg
Binary files differ
diff --git a/tests/UiBench/res/drawable-nodpi/frantic.jpg b/tests/UiBench/res/drawable-nodpi/frantic.jpg
index 4c623336e15b..856b41950d81 100644
--- a/tests/UiBench/res/drawable-nodpi/frantic.jpg
+++ b/tests/UiBench/res/drawable-nodpi/frantic.jpg
Binary files differ