diff options
author | Glenn Kasten <gkasten@google.com> | 2015-10-07 22:54:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-07 22:54:51 +0000 |
commit | fa84299fbacec8d125f4140f818df65aa6c9486f (patch) | |
tree | 5b23ab21bed9e39a0d0169a60a1b28e5bce96231 | |
parent | 67d45782c60e58d58c145595e551308c4f168d87 (diff) | |
parent | ee7e79a8c4256c1a4cfc9c9193bd0e73891cb4e8 (diff) | |
download | source.android.com-fa84299fbacec8d125f4140f818df65aa6c9486f.tar.gz |
Merge "Fix mis-matched tags" into mnc-dev
-rw-r--r-- | src/compatibility/android-cdd.html | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html index 3fa1868a..0ae68994 100644 --- a/src/compatibility/android-cdd.html +++ b/src/compatibility/android-cdd.html @@ -668,7 +668,7 @@ and match the regular expression “^[a-zA-Z0-9_-]+$”.</td> <tr> <td>FINGERPRINT</td> <td>A string that uniquely identifies this build. It SHOULD be reasonably -human-readable. It MUST follow this template:</p> +human-readable. It MUST follow this template: <p class="small">$(BRAND)/$(PRODUCT)/<br> $(DEVICE):$(VERSION.RELEASE)/$(ID)/$(VERSION.INCREMENTAL):$(TYPE)/$(TAGS)</p> <p>For example:</p> @@ -678,7 +678,7 @@ human-readable. It MUST follow this template:</p> included in the template above have whitespace characters, they MUST be replaced in the build fingerprint with another character, such as the underscore ("_") character. The value of this field MUST be encodable as 7-bit -ASCII.</td> +ASCII.</p></td> </tr> <tr> <td>HARDWARE</td> @@ -1661,7 +1661,7 @@ profiles or vice versa, if enabled by the Device Policy Controller</li> <li>Ensure the default dialer can look up caller information from the managed profile (if one exists) alongside those from the primary profile</li> <li>Ensure that all the security requirements for multi user (see -<a href="#9_5_multi-user_support">section 9.5<a/>) apply to +<a href="#9_5_multi-user_support">section 9.5</a>) apply to managed profiles.</li> </ul> @@ -1787,9 +1787,9 @@ shareware, may require patent licenses from the relevant patent holders.</p> <th>Supported File Types/Container Formats</th> </tr> <tr> - <td>MPEG-4 AAC Profile</p> + <td>MPEG-4 AAC Profile<br /> -<p>(AAC LC)</td> +(AAC LC)</td> <td>REQUIRED<sup>1</sup></td> <td>REQUIRED</td> <td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 8 to @@ -1811,9 +1811,9 @@ to 48 kHz.</td> <td></td> </tr> <tr> - <td>MPEG-4 HE AACv2</p> + <td>MPEG-4 HE AACv2<br /> -<p>Profile (enhanced AAC+)</td> +Profile (enhanced AAC+)</td> <td> </td> <td>REQUIRED</td> <td>Support for mono/stereo/5.0/5.1<sup>2</sup> content with standard sampling rates from 16 @@ -1822,12 +1822,12 @@ to 48 kHz.</td> </tr> <tr> <td>AAC ELD (enhanced low delay AAC)</td> - <td>REQUIRED<sup>1</sup> </p> + <td>REQUIRED<sup>1</sup> <br /> -<p>(Android 4.1+)</td> - <td>REQUIRED</p> +(Android 4.1+)</td> + <td>REQUIRED<br /> -<p>(Android 4.1+)</td> +(Android 4.1+)</td> <td>Support for mono/stereo content with standard sampling rates from 16 to 48 kHz.</td> <td></td> </tr> @@ -2013,12 +2013,12 @@ including Android Watch device implementations.</p> </tr> <tr> <td>VP8<sup>3</sup></td> - <td>REQUIRED<sup>2</sup></p> + <td>REQUIRED<sup>2</sup><br /> -<p>(Android 4.3+)</td> - <td>REQUIRED<sup>2</sup></p> +(Android 4.3+)</td> + <td>REQUIRED<sup>2</sup><br /> -<p>(Android 2.3.3+)</td> +(Android 2.3.3+)</td> <td>See <a href="#5_2_video_encoding">section 5.2</a> and <a href="#5_3_video_decoding">5.3</a> for details</td> <td><ul> <li class="table_list">WebM (.webm) [<a href="http://www.webmproject.org/">Resources, 110</a></li> @@ -2289,9 +2289,9 @@ the UHD decoding profile.</p> <th></th> <th>SD (Low quality)</th> <th>SD (High quality)</th> - <th>HD 720p<sup>1</sup></td> - <th>HD 1080p<sup>1</sup></td> - <th>UHD<sup>2</sup></td> + <th>HD 720p<sup>1</sup></th> + <th>HD 1080p<sup>1</sup></th> + <th>UHD<sup>2</sup></th> </tr> <tr> <th>Video resolution</th> @@ -3200,7 +3200,7 @@ mappings:</p> <table> <tr> <th>Button</th> - <th>HID Usage</strong><sup>2</sup></td> + <th>HID Usage<sup>2</sup></th> <th>Android Button</th> </tr> <tr> @@ -3224,16 +3224,16 @@ mappings:</p> <td>KEYCODE_BUTTON_Y (100)</td> </tr> <tr> - <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_UP">D-pad up</a><sup>1</sup></p> + <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_UP">D-pad up</a><sup>1</sup><br /> -<p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_DOWN">D-pad down</a><sup>1</sup></td> +<a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_DOWN">D-pad down</a><sup>1</sup></td> <td>0x01 0x0039<sup>3</sup></td> <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_Y">AXIS_HAT_Y</a><sup>4</sup></td> </tr> <tr> - <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_LEFT">D-pad left</a>1</p> + <td><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_LEFT">D-pad left</a>1<br /> -<p><a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_RIGHT">D-pad right</a><sup>1</sup></td> +<a href="http://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_DPAD_RIGHT">D-pad right</a><sup>1</sup></td> <td>0x01 0x0039<sup>3</sup></td> <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_HAT_X">AXIS_HAT_X</a><sup>4</sup></td> </tr> @@ -3285,7 +3285,7 @@ a rotation of 45 degrees and both the up and left keys being pressed.</p> <table> <tr> - <th>Analog Controls</strong><sup>1</sup></td> + <th>Analog Controls<sup>1</sup></th> <th>HID Usage</th> <th>Android Button</th> </tr> @@ -3301,21 +3301,21 @@ a rotation of 45 degrees and both the up and left keys being pressed.</p> </tr> <tr> <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_Y">Left Joystick</a></td> - <td>0x01 0x0030</p> + <td>0x01 0x0030<br /> -<p>0x01 0x0031</td> - <td>AXIS_X</p> +0x01 0x0031</td> + <td>AXIS_X<br /> -<p>AXIS_Y</td> +AXIS_Y</td> </tr> <tr> <td><a href="http://developer.android.com/reference/android/view/MotionEvent.html#AXIS_Z">Right Joystick</a></td> - <td>0x01 0x0032</p> + <td>0x01 0x0032<br /> -<p>0x01 0x0035</td> - <td>AXIS_Z</p> +0x01 0x0035</td> + <td>AXIS_Z<br /> -<p>AXIS_RZ</td> +AXIS_RZ</td> </tr> </table> @@ -3858,7 +3858,7 @@ following NFC standards: <li>NFC Forum Tag Types 1, 2, 3, 4 (defined by the NFC Forum)</li> </ul> <li>MUST be capable of reading and writing NDEF messages as well as raw - data via the following NFC standards:</li> + data via the following NFC standards: <ul> <li>NfcV (ISO 15693)</li> </ul></li> |