aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGina Dimino <gdimino@google.com>2016-08-21 17:37:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-21 17:37:46 +0000
commit8134474cd3225704ef2dd0437b3468bed723e6ca (patch)
treecfc5a787b6b9675664ae5a9d5938be51400b147f
parent6094f4183fc208ea30eff759462f340695a2ef20 (diff)
parent0b1a3366f932890154bfa30690550ac8329864ef (diff)
downloadsource.android.com-8134474cd3225704ef2dd0437b3468bed723e6ca.tar.gz
Merge "Docs: Change Android N/Nougat to Android 7.0." into nyc-dev
-rw-r--r--src/devices/tech/display/multi-window.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/tech/display/multi-window.jd b/src/devices/tech/display/multi-window.jd
index 78a19764..41aa0e98 100644
--- a/src/devices/tech/display/multi-window.jd
+++ b/src/devices/tech/display/multi-window.jd
@@ -27,7 +27,7 @@ page.title=Supporting Multi-Window
<p>
In Android 7.0, users can have multiple apps simultaneously displayed on their
device screen with the new platform feature, multi-window. In addition to the
-default implementation of multi-window, Android Nougat supports a few varieties
+default implementation of multi-window, Android 7.0 supports a few varieties
of multi-window: split-screen, free-form, and picture-in-picture.
</p>
@@ -48,7 +48,7 @@ config file on their devices to enable or disable multi-window support.
<h2 id="implementation">Implementation</h2>
<p>
-Multi-window support is enabled by default in Android N. To disable it, set
+Multi-window support is enabled by default in Android 7.0. To disable it, set
the <code>config_supportsMultiWindow</code> flag to false in the <a
href="https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/values/config.xml">config.xml</a>
file.