Merge changes I17119726,Ia1ae819a into nyc-mr1-dev

* changes:
  Merge \"docs: Moving internationalized versions of multi-window doc\" into nyc-dev am: 76f3cc7fc0
  docs: Moving internationalized versions of multi-window doc am: 82a38458e6

diff --git a/docs/html-intl/intl/es/preview/features/multi-window.jd b/docs/html-intl/intl/es/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/es/preview/features/multi-window.jd
rename to docs/html-intl/intl/es/guide/topics/ui/multi-window.jd
index 441e06a..0a9cbe2 100644 (file)
--- a/docs/html-intl/intl/es/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/es/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>En este documento</h2>
       <ol>
         <li><a href="#overview">Información general</a></li>
@@ -69,8 +69,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>Figura 1:</strong> Dos aplicaciones ejecutándose una al lado de la otra en modo de pantalla dividida.
 </p>

diff --git a/docs/html-intl/intl/in/preview/features/multi-window.jd b/docs/html-intl/intl/in/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/in/preview/features/multi-window.jd
rename to docs/html-intl/intl/in/guide/topics/ui/multi-window.jd
index 3f75def..5e7b3d9 100644 (file)
--- a/docs/html-intl/intl/in/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/in/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>Dalam dokumen ini</h2>
       <ol>
         <li><a href="#overview">Ringkasan</a></li>
@@ -69,8 +69,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>Gambar 1.</strong> Dua aplikasi berjalan berdampingan dalam mode layar terbagi.
 </p>

diff --git a/docs/html-intl/intl/ja/preview/features/multi-window.jd b/docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd
similarity index 99%
rename from docs/html-intl/intl/ja/preview/features/multi-window.jd
rename to docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd
index dba58be..a8df89d 100644 (file)
--- a/docs/html-intl/intl/ja/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>このドキュメントの内容</h2>
       <ol>
         <li><a href="#overview">概要</a></li>
@@ -69,8 +69,8 @@ TV 端末で、アプリがピクチャ イン ピクチャ モードで動画
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>図 1.</strong> 分割画面モードで並べて実行されている 2 つのアプリ。
 </p>

diff --git a/docs/html-intl/intl/ko/preview/features/multi-window.jd b/docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/ko/preview/features/multi-window.jd
rename to docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd
index bd24d9f..67305a9 100644 (file)
--- a/docs/html-intl/intl/ko/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>이 문서의 내용</h2>
       <ol>
         <li><a href="#overview">개요</a></li>
@@ -69,8 +69,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>그림 1.</strong> 화면 분할 모드에서 나란히 실행 중인 두 앱.
 </p>

diff --git a/docs/html-intl/intl/pt-br/preview/features/multi-window.jd b/docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/pt-br/preview/features/multi-window.jd
rename to docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd
index 1a48140..26259f6 100644 (file)
--- a/docs/html-intl/intl/pt-br/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>Neste documento</h2>
       <ol>
         <li><a href="#overview">Visão geral</a></li>
@@ -69,8 +69,8 @@ em modo de tela inteira.
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>Figura 1.</strong> Dois aplicativos executando lado a lado em modo de tela dividida.
 </p>

diff --git a/docs/html-intl/intl/ru/preview/features/multi-window.jd b/docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd
similarity index 99%
rename from docs/html-intl/intl/ru/preview/features/multi-window.jd
rename to docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd
index b45766c..3583616 100644 (file)
--- a/docs/html-intl/intl/ru/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/ru/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>Содержание документа</h2>
       <ol>
         <li><a href="#overview">Обзор</a></li>
@@ -68,8 +68,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>Рис. 1.</strong> Два приложения отображаются рядом в режиме разделения экрана.
 </p>

diff --git a/docs/html-intl/intl/vi/preview/features/multi-window.jd b/docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd
similarity index 99%
rename from docs/html-intl/intl/vi/preview/features/multi-window.jd
rename to docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd
index 5b2cb54..3317d1c 100644 (file)
--- a/docs/html-intl/intl/vi/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/vi/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>Trong tài liệu này</h2>
       <ol>
         <li><a href="#overview">Tổng quan</a></li>
@@ -68,8 +68,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>Hình 1.</strong> Hai ứng dụng chạy trong chế độ chia màn hình.
 </p>

diff --git a/docs/html-intl/intl/zh-cn/preview/features/multi-window.jd b/docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/zh-cn/preview/features/multi-window.jd
rename to docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd
index cfcdf6d..5ec27d7 100644 (file)
--- a/docs/html-intl/intl/zh-cn/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/zh-cn/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>本文内容</h2>
       <ol>
         <li><a href="#overview">概览</a></li>
@@ -69,8 +69,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>图 1.</strong> 两个应用在分屏模式中左右并排显示。
 </p>

diff --git a/docs/html-intl/intl/zh-tw/preview/features/multi-window.jd b/docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd
similarity index 98%
rename from docs/html-intl/intl/zh-tw/preview/features/multi-window.jd
rename to docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd
index 5ea247b..86d22fb 100644 (file)
--- a/docs/html-intl/intl/zh-tw/preview/features/multi-window.jd
+++ b/docs/html-intl/intl/zh-tw/guide/topics/ui/multi-window.jd
@@ -4,8 +4,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
+<div id="tb-wrapper">
+  <div id="tb">
     <h2>此文件內容</h2>
       <ol>
         <li><a href="#overview">總覽</a></li>
@@ -68,8 +68,8 @@ page.keywords="multi-window", "android N", "split screen", "free-form"
   </li>
 </ul>
 
-<img src="{@docRoot}preview/images/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}preview/images/mw-splitscreen.png 1x,
-    {@docRoot}preview/images/mw-splitscreen_2x.png 2x," id="img-split-screen" />
+<img src="{@docRoot}images/android-7.0/mw-splitscreen.png" alt="" width="650" srcset="{@docRoot}images/android-7.0/mw-splitscreen.png 1x,
+    {@docRoot}images/android-7.0/mw-splitscreen_2x.png 2x," id="img-split-screen" />
 <p class="img-caption">
   <strong>圖 1.</strong> 在分割畫面模式中並排執行的兩個應用程式。
 </p>