diff options
author | David Friedman <dmail@google.com> | 2015-07-10 20:28:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 20:28:22 +0000 |
commit | 888436f5eec553621904874309d1ae7e76dd739a (patch) | |
tree | 8867549d4ec40b064df2027a55359865b02eabc0 | |
parent | 2164cf4f4043b4892db5688ed53624af758fcdaa (diff) | |
parent | c1541571ff501ba7f58ab9f066828e6620aaa90c (diff) | |
download | frameworks_base-888436f5eec553621904874309d1ae7e76dd739a.zip frameworks_base-888436f5eec553621904874309d1ae7e76dd739a.tar.gz frameworks_base-888436f5eec553621904874309d1ae7e76dd739a.tar.bz2 |
am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit 'c1541571ff501ba7f58ab9f066828e6620aaa90c':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
-rw-r--r-- | docs/html-intl/intl/es/preview/overview.jd | 27 | ||||
-rw-r--r-- | docs/html-intl/intl/ja/preview/overview.jd | 29 | ||||
-rw-r--r-- | docs/html-intl/intl/ko/preview/overview.jd | 27 | ||||
-rw-r--r-- | docs/html-intl/intl/pt-br/preview/overview.jd | 27 | ||||
-rw-r--r-- | docs/html-intl/intl/ru/preview/overview.jd | 29 | ||||
-rw-r--r-- | docs/html-intl/intl/zh-cn/preview/overview.jd | 29 | ||||
-rw-r--r-- | docs/html-intl/intl/zh-tw/preview/overview.jd | 27 | ||||
-rw-r--r-- | docs/html/preview/overview.jd | 4 | ||||
-rw-r--r-- | docs/html/preview/support.jd | 8 |
9 files changed, 199 insertions, 8 deletions
diff --git a/docs/html-intl/intl/es/preview/overview.jd b/docs/html-intl/intl/es/preview/overview.jd index 49cc3d3..2cd2130 100644 --- a/docs/html-intl/intl/es/preview/overview.jd +++ b/docs/html-intl/intl/es/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> Bienvenido a <strong>Android M Developer Preview</strong>, el programa que le brinda todo lo que necesita para probar y optimizar sus aplicaciones para la próxima versión de Android. diff --git a/docs/html-intl/intl/ja/preview/overview.jd b/docs/html-intl/intl/ja/preview/overview.jd index 4cefdd1..c5390ef 100644 --- a/docs/html-intl/intl/ja/preview/overview.jd +++ b/docs/html-intl/intl/ja/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 Developer Preview</strong> では、Android の次のバージョンでアプリをテストして最適化するためのすべてを備えています。 @@ -323,7 +350,7 @@ Android M 最終 SDK が利用可能になれば正式な Android M API レベ </h2> <p> - アプリのテストをはじめるには: + アプリのテストをはじめるには: </p> <ol> diff --git a/docs/html-intl/intl/ko/preview/overview.jd b/docs/html-intl/intl/ko/preview/overview.jd index d325725..04febc7 100644 --- a/docs/html-intl/intl/ko/preview/overview.jd +++ b/docs/html-intl/intl/ko/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의 다음 버전에 대해 앱을 테스트하고 최적화하는 데 필요한 모든 것을 제공해 드립니다. diff --git a/docs/html-intl/intl/pt-br/preview/overview.jd b/docs/html-intl/intl/pt-br/preview/overview.jd index ce5a596..e81ccd7 100644 --- a/docs/html-intl/intl/pt-br/preview/overview.jd +++ b/docs/html-intl/intl/pt-br/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> Boas-vindas ao <strong>Android M Developer Preview</strong>, um programa que fornece tudo que é necessário para testar e otimizar os aplicativos para a próxima versão diff --git a/docs/html-intl/intl/ru/preview/overview.jd b/docs/html-intl/intl/ru/preview/overview.jd index 6ed1d20..d1345a2 100644 --- a/docs/html-intl/intl/ru/preview/overview.jd +++ b/docs/html-intl/intl/ru/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 Developer Preview</strong>, участники которой получают всё необходимоедля тестирования и оптимизации своих приложений для следующей версии платформы Android. @@ -114,7 +141,7 @@ page.tags="preview", "developer", "android" <img src="{@docRoot}preview/images/m-preview-timeline-crop.png" alt="Preview program timeline" id="timeline"> <p> Тестирование версии M Developer Preview запланировано на период с 28 мая до выпуска окончательной версии пакета SDK Android M, который -состоится незадолго до публикации новой платформы в открытом доступе в +состоится незадолго до публикации новой платформы в открытом доступе в третьем квартале 2015 г. </p> 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> 功能 — 在最终的 SDK 发布之前,这些 API 都不是正式的 API。目前,最终的 SDK 计划于 2015 年第三季度发布。 这意味着一段时期内,特别是该计划的最初几周内, <strong>API 可能会出现细微变化</strong>。 diff --git a/docs/html-intl/intl/zh-tw/preview/overview.jd b/docs/html-intl/intl/zh-tw/preview/overview.jd index 63cde32..9693eec 100644 --- a/docs/html-intl/intl/zh-tw/preview/overview.jd +++ b/docs/html-intl/intl/zh-tw/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> 歡迎使用「Android M 開發人員預覽版」<strong></strong>,本程式提供為新版 Android 測試和最佳化您應用程式所需的一切。 diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd index a19c926..009e268 100644 --- a/docs/html/preview/overview.jd +++ b/docs/html/preview/overview.jd @@ -13,13 +13,13 @@ page.tags="preview", "developer", "android" <ul class="dac-section-links"> <li class="dac-section-link"> - <a href="#preview2-notes"> + <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="#preview2-get"> + <a href="{@docRoot}preview/support.html#preview2-get"> <span class="dac-sprite dac-auto-chevron"></span> Get the Update</a> </li> diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd index 8792f77..d908f77 100644 --- a/docs/html/preview/support.jd +++ b/docs/html/preview/support.jd @@ -246,9 +246,11 @@ page.image=images/cards/card-support_16-9_2x.png <strong>Clear data</strong>.</li> <li>In YouTube app, it's not possible to share a video. The share window is blank.</li> - <li>Android For Work Profile setup is not working properly, so you won't be - able to create a new Work Profile after you update. As a workaround, make - sure to create the Work Profiles you need in Developer Preview 1 before + <li>The bundled Google Apps Device Policy app included in Developer Preview 2 is unable to + properly set up an Android for Work Profile, so you cannot create a new Work Profile with this + app after you update. This issue is specific to the Google Apps Device Policy app, and not the + Android for Work platform (or our partner EMM providers). As a workaround for users of the + Google Apps Device Policy app, be sure to create a Work Profile in Developer Preview 1 before updating to Developer Preview 2. </li> </ul> |