summaryrefslogtreecommitdiffstats
path: root/docs/html-intl/intl/zh-cn
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2015-07-10 19:55:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 19:55:22 +0000
commit1c231da06c9e9f82c52d36211a865703a5d0cd62 (patch)
tree0916a4dea8889ba0b48e95c75a24f88f865ef6a0 /docs/html-intl/intl/zh-cn
parent98b1f1025c606f955ab9afc3872a435a770e3813 (diff)
parent48143e6ab960860a87171563d8a7535b41762ffa (diff)
downloadframeworks_base-1c231da06c9e9f82c52d36211a865703a5d0cd62.zip
frameworks_base-1c231da06c9e9f82c52d36211a865703a5d0cd62.tar.gz
frameworks_base-1c231da06c9e9f82c52d36211a865703a5d0cd62.tar.bz2
am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '48143e6ab960860a87171563d8a7535b41762ffa': Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
Diffstat (limited to 'docs/html-intl/intl/zh-cn')
-rw-r--r--docs/html-intl/intl/zh-cn/preview/overview.jd29
1 files changed, 28 insertions, 1 deletions
diff --git a/docs/html-intl/intl/zh-cn/preview/overview.jd b/docs/html-intl/intl/zh-cn/preview/overview.jd
index cebbf06..d931db0 100644
--- a/docs/html-intl/intl/zh-cn/preview/overview.jd
+++ b/docs/html-intl/intl/zh-cn/preview/overview.jd
@@ -5,6 +5,33 @@ page.tags="preview", "developer", "android"
@jd:body
+<div class="cols" style=
+"background-color:#ffebc3; padding: 5px 0;margin-bottom:1em; text-align:center;">
+<h3>
+ Developer Preview 2 is now available
+ </h3>
+
+ <ul class="dac-section-links">
+ <li class="dac-section-link">
+ <a href="{@docRoot}preview/support.html#preview2-notes">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Read the Notes</a>
+ </li>
+
+ <li class="dac-section-link">
+ <a href="{@docRoot}preview/support.html#preview2-get">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Get the Update</a>
+ </li>
+
+ <li class="dac-section-link">
+ <a href="https://code.google.com/p/android-developer-preview/">
+ <span class="dac-sprite dac-auto-chevron"></span>
+ Report Issues</a>
+ </li>
+ </ul>
+</div>
+
<p>
欢迎使用 <strong>Android M 开发者预览版</strong>计划。此计划将为您提供针对 Android 的下一版本测试和优化应用所需的所有功能。
@@ -295,7 +322,7 @@ page.tags="preview", "developer", "android"
</p>
<p>
- Android M 开发者预览版提供<strong>预览 API</strong> 功能
+ Android M 开发者预览版提供<strong>预览 API</strong> 功能
&mdash; 在最终的 SDK 发布之前,这些 API 都不是正式的 API。目前,最终的 SDK 计划于 2015 年第三季度发布。
这意味着一段时期内,特别是该计划的最初几周内,
<strong>API 可能会出现细微变化</strong>。