diff options
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 32 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/string-resource.jd | 30 |
2 files changed, 53 insertions, 9 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 19f510a..2a908ba 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -71,7 +71,7 @@ page.tags=video,audio,mpeg,mp4,m4a,mp3,3gp,3gpp,flac,wave,wav </tr> <tr> -<td rowspan="11">Audio</td> +<td rowspan="12">Audio</td> <td>AAC LC</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> @@ -180,6 +180,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> </tr> <tr> +<td>Opus</td> +<td style="text-align: center;"></td> +<td style="text-align: center;"><big>•</big><br><small>(Android 5.0+)</small></td> +<td></td> +<td> + Matroska (.mkv)</td> +</tr> + +<tr> <td rowspan="5">Image</td> <td>JPEG</td> <td style="text-align: center;"><big>•</big></td> @@ -235,7 +244,7 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> <tr> -<td rowspan="4">Video</td> +<td rowspan="6">Video</td> <td>H.263</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> @@ -257,6 +266,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> </tr> <tr> +<td>H.265 HEVC</td> +<td style="text-align: center;" nowrap></td> +<td style="text-align: center;" nowrap><big>•</big><br><small>(Android 5.0+)</small></td> +<td>Main Profile Level 3 for mobile devices and Main Profile Level 4.1 for Android TV</td> +<td> + • MPEG-4 (.mp4)<br> +</tr> + +<tr> <td>MPEG-4 SP</td> <td> </td> <td style="text-align: center;"><big>•</big></td> @@ -275,6 +293,16 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> • Matroska (.mkv, Android 4.0+)</td> </tr> +<tr> +<td>VP9</td> +<td style="text-align: center;" nowrap></td> +<td style="text-align: center;" nowrap><big>•</big><br><small>(Android 4.4+)</small></td> +<td></td> +<td> + • <a href="http://www.webmproject.org/">WebM</a> (.webm)<br> + • Matroska (.mkv, Android 4.0+)</td> +</tr> + </tbody></table> diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd index cbfa82e..743e692 100644 --- a/docs/html/guide/topics/resources/string-resource.jd +++ b/docs/html/guide/topics/resources/string-resource.jd @@ -401,19 +401,35 @@ android.content.res.Resources#getQuantityString(int,int) getQuantityString}.</p> format and style your string resources.</p> -<h3>Escaping apostrophes and quotes</h3> +<h3 id="escaping_quotes">Escaping apostrophes and quotes</h3> -<p>If you have an apostrophe or a quote in your string, you must either escape it or enclose the -whole string in the other type of enclosing quotes. For example, here are some stings that -do and don't work:</p> +<p> + If you have an apostrophe (<code>'</code>) in your string, you must either + escape it with a backslash (<code>\'</code>) or enclose the string in + double-quotes (<code>""</code>). For example, here are some strings that do + and don't work: +</p> <pre> -<string name="good_example">"This'll work"</string> -<string name="good_example_2">This\'ll also work</string> +<string name="good_example">This\'ll work</string> +<string name="good_example_2">"This'll also work"</string> <string name="bad_example">This doesn't work</string> -<string name="bad_example_2">XML encodings don&apos;t work</string> + <!-- Causes a compile error --> </pre> +<p> + If you have a double-quote in your string, you must escape it + (<code>\"</code>). Surrounding the string with single-quotes does + <em>not</em> work. +</p> + +<pre> +<string name="good_example">This is a \"good string\".</string> +<string name="bad_example">This is a "bad string".</string> + <!-- Quotes are stripped; displays as: This is a bad string. --> +<string name="bad_example_2">'This is another "bad string".'</string> + <!-- Causes a compile error --> +</pre> <h3>Formatting strings</h3> |