diff options
| author | Yuichi Araki <yaraki@google.com> | 2014-12-05 03:00:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-05 03:00:29 +0000 |
| commit | 2d1624dd5897f7001b20a7d0da38b96c07deff47 (patch) | |
| tree | b68e8da5fd3e4c21e52500e71c2d780c22816af4 /media | |
| parent | e394ec0126fa55cd1472e62a1051b6a4e41f435c (diff) | |
| parent | bf51a1d3edfd5e54c983a4fdf87a840ae18ed752 (diff) | |
| download | android-2d1624dd5897f7001b20a7d0da38b96c07deff47.tar.gz | |
Merge "Fix metadata for some samples" into lmp-docs
Diffstat (limited to 'media')
| -rw-r--r--[-rwxr-xr-x] | media/Camera2Basic/screenshots/icon-web.png (renamed from media/Camera2Basic/Application/src/main/big_icon.png) | bin | 64937 -> 64937 bytes | |||
| -rw-r--r-- | media/Camera2Basic/template-params.xml | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | media/MediaEffects/screenshots/icon-web.png (renamed from media/MediaEffects/Application/src/main/big_icon.png) | bin | 68334 -> 68334 bytes | |||
| -rw-r--r-- | media/MediaEffects/template-params.xml | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/media/Camera2Basic/Application/src/main/big_icon.png b/media/Camera2Basic/screenshots/icon-web.png Binary files differindex d9bd4c48..d9bd4c48 100755..100644 --- a/media/Camera2Basic/Application/src/main/big_icon.png +++ b/media/Camera2Basic/screenshots/icon-web.png diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml index e993e21b..b4afe4c4 100644 --- a/media/Camera2Basic/template-params.xml +++ b/media/Camera2Basic/template-params.xml @@ -41,7 +41,7 @@ <languages>Java</languages> <solutions>Mobile</solutions> <level>INTERMEDIATE</level> - <icon>Application/src/main/big_icon.png</icon> + <icon>screenshots/icon-web.png</icon> <screenshots> <img>screenshots/main.png</img> </screenshots> @@ -56,10 +56,12 @@ </api_refs> <description> +<![CDATA[ This sample demonstrates how to use basic functionalities of Camera2 API. You can learn how to iterate through characteristics of all the cameras attached to the device, display a camera preview, and take pictures. +]]> </description> <intro> diff --git a/media/MediaEffects/Application/src/main/big_icon.png b/media/MediaEffects/screenshots/icon-web.png Binary files differindex e04452c8..e04452c8 100755..100644 --- a/media/MediaEffects/Application/src/main/big_icon.png +++ b/media/MediaEffects/screenshots/icon-web.png diff --git a/media/MediaEffects/template-params.xml b/media/MediaEffects/template-params.xml index 1eb44d3c..8d4db617 100644 --- a/media/MediaEffects/template-params.xml +++ b/media/MediaEffects/template-params.xml @@ -50,7 +50,7 @@ <languages>Java</languages> <solutions>Mobile</solutions> <level>ADVANCED</level> - <icon>Application/src/main/big_icon.png</icon> + <icon>screenshots/icon-web.png</icon> <screenshots> <img>screenshots/menu.png</img> <img>screenshots/duotone.png</img> @@ -63,8 +63,10 @@ </api_refs> <description> +<![CDATA[ This sample shows how to use the Media Effects APIs that were introduced in Android 4.0. +]]> </description> <intro> |
