Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fc279b authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes I17119726,Ia1ae819a into nyc-mr1-dev 

* changes:
  Merge \"docs: Moving internationalized versions of multi-window doc\" into nyc-dev am: 76f3cc7f
  docs: Moving internationalized versions of multi-window doc am: 82a38458
parents f8467663 1108b99e

docs/html-intl/intl/es/preview/features/multi-window.jd→docs/html-intl/intl/es/guide/topics/ui/multi-window.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>

docs/html-intl/intl/in/preview/features/multi-window.jd→docs/html-intl/intl/in/guide/topics/ui/multi-window.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>

docs/html-intl/intl/ja/preview/features/multi-window.jd→docs/html-intl/intl/ja/guide/topics/ui/multi-window.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>

docs/html-intl/intl/ko/preview/features/multi-window.jd→docs/html-intl/intl/ko/guide/topics/ui/multi-window.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>

docs/html-intl/intl/pt-br/preview/features/multi-window.jd→docs/html-intl/intl/pt-br/guide/topics/ui/multi-window.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>