Merge "Docs: Changes to source.android.com"

am: 1d024fdd31

Change-Id: Ibb2838482bff71b5bb761d4f28c211313c1b101a

10 files changed, 92 insertions, 20 deletions

diff --git a/en/devices/_toc-interfaces.yaml b/en/devices/_toc-interfaces.yaml
index 388219bc..fc1d43a6 100644
--- a/en/devices/_toc-interfaces.yaml
+++ b/en/devices/_toc-interfaces.yaml
@@ -12,9 +12,9 @@ toc:
   - title: Kernel
     section:
     - title: Configuration
-      path: /devices/tech/config/kernel
+      path: /devices/architecture/kernel/config
     - title: Network Tests
-      path: /devices/tech/config/kernel_network_tests
+      path: /devices/architecture/kernel/network_tests
 - title: Audio
   section:
   - title: Overview
@@ -119,6 +119,8 @@ toc:
       path: /devices/graphics/arch-sh
     - title: OpenGL ES
       path: /devices/graphics/arch-egl-opengl
+    - title: OpenGLRenderer Configuration
+      path: /devices/graphics/renderer
     - title: Vulkan
       path: /devices/graphics/arch-vulkan
     - title: SurfaceView
diff --git a/en/devices/_toc-tech.yaml b/en/devices/_toc-tech.yaml
index f2e27d7a..da603b20 100644
--- a/en/devices/_toc-tech.yaml
+++ b/en/devices/_toc-tech.yaml
@@ -25,16 +25,10 @@ toc:
     path: /devices/tech/config/
   - title: Carrier Customization
     path: /devices/tech/config/carrier
-  - title: Connectivity Tests
-    path: /devices/tech/config/connect_tests
   - title: File DAC Configuration
     path: /devices/tech/config/filesystem
-  - title: Low RAM
-    path: /devices/tech/config/low-ram
   - title: Namespaces for Libraries
     path: /devices/tech/config/namespaces_libraries
-  - title: OpenGLRenderer
-    path: /devices/tech/config/renderer
   - title: Runtime Permissions
     path: /devices/tech/config/runtime_perms
   - title: UICC
@@ -55,6 +49,8 @@ toc:
     path: /devices/tech/connect/emergency-affordance
   - title: Host Card Emulation of FeliCa
     path: /devices/tech/connect/felica
+  - title: Network Connectivity Tests
+    path: /devices/tech/connect/connect_tests
   - title: Radio Interface Layer (RIL)
     path: /devices/tech/connect/ril
 - title: Data Usage
@@ -95,16 +91,10 @@ toc:
       path: /devices/tech/debug/jank_jitter
   - title: AddressSanitizer
     path: /devices/tech/debug/asan
-  - title: Dumpsys
-    path: /devices/tech/debug/dumpsys
   - title: Using GDB
     path: /devices/tech/debug/gdb
   - title: Native Memory Use
     path: /devices/tech/debug/native-memory
-  - title: Network Use
-    path: /devices/tech/debug/netstats
-  - title: RAM Use
-    path: /devices/tech/debug/procstats
   - title: Strace
     path: /devices/tech/debug/strace
   - title: Valgrind
@@ -129,7 +119,7 @@ toc:
     path: /devices/tech/admin/testing-provision
   - title: Testing Device Administration
     path: /devices/tech/admin/testing-setup
-- title: Display Settings
+- title: Display
   section:
   - title: Overview
     path: /devices/tech/display/
@@ -167,6 +157,12 @@ toc:
     path: /devices/tech/ota/sign_builds
   - title: A/B System Updates
     path: /devices/tech/ota/ab_updates
+- title: Performance
+  section:
+  - title: Overview
+    path: /devices/tech/perf/
+  - title: Low RAM
+    path: /devices/tech/perf/low-ram
 - title: Power
   section:
   - title: Overview
@@ -183,6 +179,10 @@ toc:
     path: /devices/tech/power/values
   - title: Battery Use
     path: /devices/tech/power/batterystats
+- title: Settings Menu
+  section:
+  - title: Overview
+    path: /devices/tech/settings/
 - title: Testing Infrastructure
   section:
   - title: Overview
diff --git a/en/devices/tech/config/kernel.html b/en/devices/architecture/kernel/config.html
index 14d2ee17..14d2ee17 100644
--- a/en/devices/tech/config/kernel.html
+++ b/en/devices/architecture/kernel/config.html
diff --git a/en/devices/tech/config/kernel_network_tests.html b/en/devices/architecture/kernel/network_tests.html
index bc437ad2..bc437ad2 100644
--- a/en/devices/tech/config/kernel_network_tests.html
+++ b/en/devices/architecture/kernel/network_tests.html
diff --git a/en/devices/tech/config/renderer.html b/en/devices/graphics/renderer.html
index 7ee28f10..7ee28f10 100644
--- a/en/devices/tech/config/renderer.html
+++ b/en/devices/graphics/renderer.html
diff --git a/en/devices/tech/config/connect_tests.html b/en/devices/tech/connect/connect_tests.html
index a7c06a83..a7c06a83 100644
--- a/en/devices/tech/config/connect_tests.html
+++ b/en/devices/tech/connect/connect_tests.html
diff --git a/en/devices/tech/ota/ab_updates.html b/en/devices/tech/ota/ab_updates.html
index fee00bc2..871d8f63 100644
--- a/en/devices/tech/ota/ab_updates.html
+++ b/en/devices/tech/ota/ab_updates.html
@@ -31,10 +31,20 @@
   repair and warranty centers. This approach is already explored successfully by
   other commercial-grade operating systems, such as <a
   href="https://www.chromium.org/chromium-os">ChromeOS</a>, and Android 8.0
-  comes with the necessary platform changes to conduct streaming updates. Android
-  7.0 and later support streaming updates with the correct version of <a
-    href="https://www.android.com/gms/">Google Mobile Services (GMS)</a>
-  installed.</p>
+  comes with the necessary platform changes to conduct streaming updates.</p>
+
+<p class="note"><strong>Note:</strong> Android 7.1, in which A/B updates were
+introduced, requires the following patches to be cherrypicked before streaming
+updates can be enabled. This is true whether using <a
+href="https://www.android.com/gms/">Google Mobile Services (GMS)</a> or any
+other update client.</p>
+
+<ul>
+  <li><a href="https://android-review.googlesource.com/333624">Allow to cancel a proxy resolution request</a></li>
+  <li><a href="https://android-review.googlesource.com/333625">Fix terminating a transfer while resolving proxies</a></li>
+  <li><a href="https://android-review.googlesource.com/333626">Add unittest for TerminateTrasnfer between ranges</a></li>
+  <li><a href="https://android-review.googlesource.com/333627">Cleanup the RetryTimeoutCallback()</a></li>
+</ul>
 
 <p>
   Users don't always have enough space on <code>/data</code> to download the
@@ -620,7 +630,7 @@ depended on what updates you wanted to apply. The worst case would be a cache
 partition as large as the system image. With A/B updates there's no need to
 stash blocks (because you're always writing to a partition that isn't currently
 used) and with streaming A/B there's no need to download the whole OTA package
-before applying it (see "How do streaming A/B updates work?").</p>
+before applying it.</p>
 
 <h3 id="fstab">Fstab</h3>
 
diff --git a/en/devices/tech/perf/index.html b/en/devices/tech/perf/index.html
new file mode 100644
index 00000000..6af0626c
--- /dev/null
+++ b/en/devices/tech/perf/index.html
@@ -0,0 +1,30 @@
+<html devsite>
+  <head>
+    <title>Performance</title>
+    <meta name="project_path" value="/_project.yaml" />
+    <meta name="book_path" value="/_book.yaml" />
+  </head>
+  <body>
+  <!--
+      Copyright 2017 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+  -->
+
+
+
+<p>Follow the instructions in this section to ensure your Android devices
+minimize resource use and optimize performance.</p>
+
+  </body>
+</html>
diff --git a/en/devices/tech/config/low-ram.html b/en/devices/tech/perf/low-ram.html
index d1ca5b5e..d1ca5b5e 100644
--- a/en/devices/tech/config/low-ram.html
+++ b/en/devices/tech/perf/low-ram.html
diff --git a/en/devices/tech/settings/index.html b/en/devices/tech/settings/index.html
new file mode 100644
index 00000000..0b3066d8
--- /dev/null
+++ b/en/devices/tech/settings/index.html
@@ -0,0 +1,30 @@
+<html devsite>
+  <head>
+    <title>Settings Menu</title>
+    <meta name="project_path" value="/_project.yaml" />
+    <meta name="book_path" value="/_book.yaml" />
+  </head>
+  <body>
+  <!--
+      Copyright 2017 The Android Open Source Project
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+  -->
+
+
+
+<p>The pages in this section explain how to employ the latest features
+available in the Android Settings menu.</p>
+
+  </body>
+</html>