diff options
author | Clay Murphy <claym@google.com> | 2018-03-20 21:35:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-20 21:35:29 +0000 |
commit | 58698527ce74d3772fa08316e6436c50fdf629ef (patch) | |
tree | 3f30b9d10c3d5e6b0e923933078ffb144effe610 | |
parent | 701b7fac720fcf01ad083ec7e9a41ee35f7cada1 (diff) | |
parent | 44d80a9d5817285ee9cfc63a2eaf78f4208a7f2e (diff) | |
download | source.android.com-58698527ce74d3772fa08316e6436c50fdf629ef.tar.gz |
Merge "Docs: Changes to source.android.com"
-rw-r--r-- | en/compatibility/source/android-cdd-cover.html | 2 | ||||
-rw-r--r-- | en/devices/architecture/images/treble_vndk_design.png | bin | 28465 -> 34590 bytes | |||
-rw-r--r-- | en/legal.html | 4 | ||||
-rw-r--r-- | en/security/bulletin/2018-02-01.html | 2 | ||||
-rw-r--r-- | en/security/index.html | 2 | ||||
-rw-r--r-- | en/setup/brands.html | 4 | ||||
-rw-r--r-- | zh-cn/_index.yaml | 8 | ||||
-rw-r--r-- | zh-cn/compatibility/cts/development.html | 34 | ||||
-rw-r--r-- | zh-cn/compatibility/cts/setup.html | 4 | ||||
-rw-r--r-- | zh-cn/legal.html | 6 | ||||
-rw-r--r-- | zh-cn/setup/brands.html | 6 |
11 files changed, 31 insertions, 41 deletions
diff --git a/en/compatibility/source/android-cdd-cover.html b/en/compatibility/source/android-cdd-cover.html index fbc7256f..7fd2aa3f 100644 --- a/en/compatibility/source/android-cdd-cover.html +++ b/en/compatibility/source/android-cdd-cover.html @@ -26,7 +26,7 @@ style="border-top: 5px solid orange; border-bottom: 5px solid orange"/> <td> <p class="subtitle">Android 8.0</p> <p class="cover-text">Last updated: September 1, 2017</p> -<p class="cover-text">Copyright © 2017, Google Inc. All rights reserved.</p> +<p class="cover-text">Copyright © 2018, Google LLC All rights reserved.</p> <p class="cover-text"><a href="mailto:compatibility@android.com">compatibility@android.com</a></p> </td> </tr> diff --git a/en/devices/architecture/images/treble_vndk_design.png b/en/devices/architecture/images/treble_vndk_design.png Binary files differindex f41bded8..205a97ed 100644 --- a/en/devices/architecture/images/treble_vndk_design.png +++ b/en/devices/architecture/images/treble_vndk_design.png diff --git a/en/legal.html b/en/legal.html index 733675e4..181d4bf7 100644 --- a/en/legal.html +++ b/en/legal.html @@ -27,7 +27,7 @@ <div class="landing-banner"> - <p>Android is developed by Google Inc. and the <a + <p>Android is developed by Google LLC and the <a href="http://www.openhandsetalliance.com/">Open Handset Alliance</a>. We've made it available to you as a development platform pursuant to our commitment to openness, freedom, and innovation in mobile.</p> @@ -38,7 +38,7 @@ <p>The "Android" name, the <img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, and -<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google Inc.</p> +<a href="http://www.google.com/permissions/">other trademarks</a> are property of Google LLC.</p> <p>See the <a href="/setup/brands.html">Brand Guidelines</a> for additional details.</p> diff --git a/en/security/bulletin/2018-02-01.html b/en/security/bulletin/2018-02-01.html index 878f2beb..972ff4d2 100644 --- a/en/security/bulletin/2018-02-01.html +++ b/en/security/bulletin/2018-02-01.html @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <p><em>Published February 5, 2018 | February 14, 2018</em></p> + <p><em>Published February 5, 2018 | Updated February 14, 2018</em></p> <p> diff --git a/en/security/index.html b/en/security/index.html index ca4e45e3..24d4b54a 100644 --- a/en/security/index.html +++ b/en/security/index.html @@ -158,7 +158,7 @@ Android devices with <a href="https://www.android.com/gms/">Google Mobile Services</a>. While these services are not part of the Android Open Source Project, they are included on many Android devices. For more information on some of these services, see Android Security’s -<a href="/security/reports/Google_Android_Security_2016_Report_Final.pdf">2016 +<a href="/security/reports/Google_Android_Security_2017_Report_Final.pdf">2017 Year in Review</a>. </p> <p> diff --git a/en/setup/brands.html b/en/setup/brands.html index 17927169..ca08b8dd 100644 --- a/en/setup/brands.html +++ b/en/setup/brands.html @@ -25,7 +25,7 @@ <p>The "Android" name, the <img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline" /> logo, -the "Google Play" brand, and other trademarks are property of Google Inc. and +the "Google Play" brand, and other trademarks are property of Google LLC and not part of the assets available through the Android Open Source Project.</p> <p>If you are interested in using these brands to indicate their association @@ -74,7 +74,7 @@ assets.</p> </ul> <p><strong>Any use of the Android name must include this attribution in your communication</strong>:</p> - <blockquote><em>Android is a trademark of Google Inc.</em></blockquote></p> + <blockquote><em>Android is a trademark of Google LLC.</em></blockquote></p> </li> </ul> diff --git a/zh-cn/_index.yaml b/zh-cn/_index.yaml index 5ba3e461..ff30e0de 100644 --- a/zh-cn/_index.yaml +++ b/zh-cn/_index.yaml @@ -54,12 +54,12 @@ landing_page: image_path: /images/android_stack.png - heading: 新闻 items: - - heading: 2 月安全公告 + - heading: 3 月安全公告 description: > - 2018 年 2 月的 Android 和 Pixel/Nexus 安全公告已经发布,其中提供了与 2 月安全更新补丁相关的信息。 + 2018 年 3 月的 Android 和 Pixel/Nexus 安全公告已经发布,其中提供了与 3 月安全更新补丁相关的信息。 buttons: - - label: 2018 年 2 月 7 日 - path: /security/bulletin/2018-02-01 + - label: 2018 年 3 月 7 日 + path: /security/bulletin/2018-03-01 - heading: ART DEX 字节码方面的改进 description: > Android 运行时 (ART) 现在包含 <code>const-method-handle</code> 和 <code>const-method-type</code> diff --git a/zh-cn/compatibility/cts/development.html b/zh-cn/compatibility/cts/development.html index 81c6c645..bdd3cd0c 100644 --- a/zh-cn/compatibility/cts/development.html +++ b/zh-cn/compatibility/cts/development.html @@ -27,7 +27,8 @@ init</code> 命令时,请按照<a href="/setup/downloading.html">相关说明< <h2 id="building-and-running-cts">构建和运行 CTS</h2> <p>执行以下命令以构建 CTS 并启动交互式 CTS 控制台:</p> -<p class="note"><strong>注意</strong>:您可以为 <code>TARGET_PRODUCT</code> 提供以下其他值之一,以针对不同的架构进行编译:<code>aosp_x86_64</code> 或 <code>aosp_mips</code></p> +<p class="note"><strong>注意</strong>:您可以为 <code>TARGET_PRODUCT</code> 提供以下其他值之一,以针对不同的架构进行编译: +<code>aosp_x86_64</code> 或 <code>aosp_mips</code></p> <pre class="devsite-click-to-copy"> <code class="devsite-terminal">cd <em>/path/to/android/root</em></code> <code class="devsite-terminal">make cts -j32 TARGET_PRODUCT=aosp_arm64</code> @@ -189,6 +190,11 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) </thead> <tbody> <tr> + <td>8.1</td> + <td>oreo-mr1-cts-dev</td> + <td>每月</td> + </tr> +<tr> <td>8.0</td> <td>oreo-cts-dev</td> <td>每月</td> @@ -214,24 +220,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) <td>每月</td> </tr> <tr> - <td>5.0</td> - <td>lollipop-cts-dev</td> - <td>无版本发布计划</td> -</tr> -<tr> - <td>4.4</td> - <td>kitkat-cts-dev</td> - <td>无版本发布计划</td> -</tr> -<tr> - <td>4.3</td> - <td>jb-mr2-cts-dev</td> - <td>无版本发布计划</td> -</tr> -<tr> - <td>4.2</td> - <td>jb-mr1.1-cts-dev</td> - <td>无版本发布计划</td> + <td colspan="3">对于 5.0、4.4、4.3 和 4.2,无发布计划。</td> </tr> </tbody></table> @@ -246,10 +235,11 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) <h3 id="auto-merge">自动合并流程</h3> <p>CTS 开发分支已设置,因此提交到每个分支的更改将自动合并,如下所示:<br /> -jb-dev-> jb-mr1.1-cts-dev -> jb-mr2-cts-dev -> kitkat-cts-dev -> -lollipop-cts-dev -> lollipop-mr1-cts-dev -> marshmallow-cts-dev -> -nougat-cts-dev -> nougat-mr1-cts-dev -> oreo-cts-dev -> <private-development-branch for Android O MR1></p> +lollipop-mr1-cts-dev -> marshmallow-cts-dev -> +nougat-cts-dev -> nougat-mr1-cts-dev -> oreo-cts-dev -> oreo-mr1-cts-dev -> <private-development-branch for Android P></p> <p>如果变更列表 (CL) 未能正确合并,CL 的作者将收到一封电子邮件,其中包含有关如何解决冲突的说明。在大多数情况下,CL 作者可以通过这些说明来跳过存在冲突的 CL 的自动合并流程。</p> +<p>此外,如果较旧的分支需要更改,则需要从较新的分支挑选 CL。</p> + </body></html>
\ No newline at end of file diff --git a/zh-cn/compatibility/cts/setup.html b/zh-cn/compatibility/cts/setup.html index 3e070469..33826948 100644 --- a/zh-cn/compatibility/cts/setup.html +++ b/zh-cn/compatibility/cts/setup.html @@ -115,7 +115,7 @@ ro.product.first_api_level=21 <h3 id="storage_requirements">存储空间要求</h3> <p>CTS 媒体压力测试要求将视频剪辑存放在外部存储设备 (<code>/sdcard</code>) 上。大部分剪辑来自 <a href="https://peach.blender.org/">Big Buck Bunny</a>,其版权归 Blender Foundation 所有并采用 <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 许可</a>。</p> -<p>所需空间取决于设备支持的最高视频播放分辨率(要查看所需分辨率的平台版本,请参阅兼容性定义文档中的第 5 部分)。请注意,被测设备的视频播放功能将通过 <code>android.media.CamcorderProfile</code> API(针对早期 Android 版本)和 <code>android.media.MediaCodecInfo.CodecCapabilities</code> API(针对 Android 5.0 及更高版本)进行检测。</p> +<p>所需空间取决于设备支持的最高视频播放分辨率(要查看所需分辨率的平台版本,请参阅兼容性定义文档中的第 5 部分)。请注意,被测设备的视频播放功能将通过 <code>android.media.CamcorderProfile</code> API(针对早期 Android 版本)和 <code>android.media.MediaCodecInfo.CodecCapabilities</code> API(针对 Android 5.0)进行检测。</p> <p>以下是按最大视频播放分辨率列出的存储空间要求:</p> <ul> <li>480x360:98 MB</li><li>720x480:193 MB</li><li>1280x720:606 MB</li><li>1920x1080:1863 MB</li></ul> @@ -140,7 +140,7 @@ ro.product.first_api_level=21 <p class="warning"><strong>警告:</strong>这将清空设备中的所有用户数据。</p> </li><li>将设备的语言设置为英语(<strong>美国</strong>):<strong>设置 > 语言和输入法 > 语言</strong> </li><li>如果设备具有 GPS 或 WLAN/移动网络功能,则打开位置信息设置:<strong>设置 > 位置信息 > 开启</strong> - </li><li><em></em>连接到满足以下要求的 WLAN 网络:支持 IPv6,可以将被测设备 (DUT) 视为隔离的客户端(请参阅上文的<a href="#physical_environment">物理环境</a>部分),并可以连接到互联网:<strong>设置 > WLAN</strong> + </li><li>连接到满足以下要求的 WLAN 网络:支持 IPv6,可以将被测设备 (DUT) 视为隔离的客户端(请参阅上文的<a href="#physical_environment">物理环境</a>部分),并可以连接到互联网:<strong>设置 > WLAN</strong><em></em> </li><li>确保设备上未设置锁定图案或密码:<strong>设置 > 安全 > 屏幕锁定 > 无</strong> </li><li>在设备上启用 <strong>USB 调试</strong>:<strong>设置 > 开发者选项 > USB 调试</strong>。 <p class="note"><strong>注意:</strong>在 Android 4.2 及更高版本中,默认情况下会隐藏<strong>开发者选项</strong>。要显示这些选项,请依次转到<strong>设置 > 关于手机</strong>,然后点按<strong>版本号</strong>七次。返回上一屏幕以查找<strong>开发者选项</strong>。要查看其他详细信息,请参阅<a href="http://developer.android.com/studio/run/device.html#developer-device-options">启用设备上的开发者选项</a>。</p> diff --git a/zh-cn/legal.html b/zh-cn/legal.html index 7bf5eaa5..6e97ba7c 100644 --- a/zh-cn/legal.html +++ b/zh-cn/legal.html @@ -24,13 +24,13 @@ <div class="landing-banner"> - <p>Android 由 Google Inc. 和<a href="http://www.openhandsetalliance.com/">开放手机联盟</a> (Open Handset Alliance) 联合开发。为了履行打造开放、自由和创新的移动环境的承诺,我们将其作为开发平台提供给您。</p> + <p>Android 由 Google LLC 和<a href="http://www.openhandsetalliance.com/">开放手机联盟</a> (Open Handset Alliance) 联合开发。为了履行打造开放、自由和创新的移动环境的承诺,我们将其作为开发平台提供给您。</p> </div> <h2 id="Brands">Android 品牌</h2> -<p>“Android”名称、<img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline"/> 徽标和<a href="http://www.google.com/permissions/">其他商标</a>均为 Google Inc. 的财产。</p> +<p>“Android”名称、<img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline"/> 徽标和<a href="http://www.google.com/permissions/">其他商标</a>均为 Google LLC 的财产。</p> <p>要了解更多详情,请参阅<a href="/setup/brands.html">品牌推广指南</a>。</p> @@ -45,4 +45,4 @@ <div> -</div></div></body></html>
\ No newline at end of file +</div></div></body></html> diff --git a/zh-cn/setup/brands.html b/zh-cn/setup/brands.html index 9031a951..eec6d5d9 100644 --- a/zh-cn/setup/brands.html +++ b/zh-cn/setup/brands.html @@ -20,7 +20,7 @@ limitations under the License. --> -<p>“Android”名称、<img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline"/> 徽标、“Google Play”品牌以及其他商标均为 Google Inc. 的资产,不属于通过 Android 开源项目提供的资源的一部分。</p> +<p>“Android”名称、<img src="/setup/assets/images/sac_logo.png" alt="Android" style="margin:0;padding:0 2px;vertical-align:baseline"/> 徽标、“Google Play”品牌以及其他商标均为 Google LLC 的资产,不属于通过 Android 开源项目提供的资源的一部分。</p> <p>如果您希望使用这些品牌,以表明它们与您的设备之间存在关联,请遵循本页中的准则。这些准则与 <a href="https://developer.android.com/distribute/tools/promote/brand.html">Android 应用开发者品牌指南</a>和 <a href="https://www.google.com/permissions/">Google 品牌权限</a>是相辅相成的关系。</p> @@ -48,7 +48,7 @@ <li><span style="color:green">正确</span>:“Android 移动设备”</li> </ul> <p><strong>无论在任何情况下使用 Android 名称,都必须在您的资料中包含以下归属信息</strong>:</p> - <blockquote><em>Android 是 Google Inc. 的商标。</em></blockquote><p></p> + <blockquote><em>Android 是 Google LLC 的商标。</em></blockquote><p></p> </li> </ul> @@ -101,4 +101,4 @@ <p>如需了解更多品牌使用信息,请通过提交<a href="https://support.google.com/googleplay/contact/brand_developer">合作伙伴品牌咨询表单</a>与 Android 合作伙伴营销团队联系。</p> -</body></html>
\ No newline at end of file +</body></html> |