diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 774339a964dbe..cf56f2bb12684 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -799,10 +799,24 @@ redirects:
to: http://android-developers.blogspot.com/2016/03/first-preview-of-android-n-developer.html
- from: /reference/org/apache/http/...
to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
-- from: /shareables/...
- to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/...
-- from: /downloads/...
- to: https://commondatastorage.googleapis.com/androiddevelopers/...
+- from: /shareables/
+ to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/
+- from: /downloads/
+ to: https://commondatastorage.googleapis.com/androiddevelopers/
+- from: /training/performance/battery/network/action-any-traffic.html
+ to: /topic/performance/power/network/action-any-traffic.html
+- from: /training/performance/battery/network/action-app-traffic.html
+ to: /topic/performance/power/network/action-app-traffic.html
+- from: /training/performance/battery/network/action-server-traffic.html
+ to: /topic/performance/power/network/action-server-traffic.html
+- from: /training/performance/battery/network/action-user-traffic.html
+ to: /topic/performance/power/network/action-user-traffic.html
+- from: /training/performance/battery/network/analyze-data.html
+ to: /topic/performance/power/network/analyze-data.html
+- from: /training/performance/battery/network/gather-data.html
+ to: /topic/performance/power/network/gather-data.html
+- from: /training/performance/battery/network/index.html
+ to: /topic/performance/power/network/index.html
# Redirects for the new [dac]/topic/libraries/ area
@@ -1176,4 +1190,4 @@ redirects:
- from: /r/studio-ui/experimental-to-stable-gradle.html
to: http://tools.android.com/tech-docs/new-build-system/gradle-experimental/experimental-to-stable-gradle
- from: /r/studio-ui/sdk-manager.html
- to: https://developer.android.com/studio/intro/update.html#sdk-manager
\ No newline at end of file
+ to: https://developer.android.com/studio/intro/update.html#sdk-manager
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index dc152f87837b6..5784179a00581 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -3613,6 +3613,59 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
"lang":"en",
"type":"Video"
},
+
+ {
+ "title":"Android Performance Testing Codelab",
+ "titleFriendly":"",
+ "summary":"This codelab shows how to create a stable and reusable testing harness to run performance tests on a very simple existing app.",
+ "url":"https://codelabs.developers.google.com/codelabs/android-perf-testing/index.html",
+ "group":"",
+ "keywords": ["testing"],
+ "tags": [
+ ],
+ "image":"images/testing/testing-icon.png",
+ "type":"google"
+ },
+
+ {
+ "title":"Introduction to Doze",
+ "category":"android developers",
+ "summary":"A new way for the device to preserve battery by entering into an idle state.",
+ "url":"https://www.youtube.com/watch?v=N72ksDKrX6c",
+ "group":"",
+ "keywords": ["android, performance","battery"],
+ "tags": ["video, performance"],
+ "image":"https://i1.ytimg.com/vi/N72ksDKrX6c/maxresdefault.jpg",
+ "lang":"en",
+ "type":"develop"
+ },
+
+ {
+ "title":"Performance Profiling Tools",
+ "category":"training",
+ "summary":"Take a look under the hood to identify performance bottlenecks.",
+ "url":"https://developer.android.com/tools/performance/index.html",
+ "group":"",
+ "keywords": ["android, performance","profiling"],
+ "tags": ["android, performance"],
+ "image":"/assets/images/resource-card-default-android.jpg",
+ "lang":"en",
+ "type":"develop"
+ },
+
+ {
+ "title":"Managing Your App's Memory",
+ "category":"training",
+ "summary":"Learn how you can proactively reduce memory usage while developing for Android.",
+ "url":"https://developer.android.com/training/articles/memory.html",
+ "group":"",
+ "keywords": ["android, performance","profiling"],
+ "tags": ["android, performance"],
+ "image":"/assets/images/resource-card-default-android.jpg",
+ "lang":"en",
+ "type":"develop"
+ },
+
{
"url":"https://www.youtube.com/watch?v=QDM52bblwlg",
"image": "images/distribute/hero-family-discovery.jpg",
@@ -5379,12 +5432,26 @@ METADATA['en'].collections = {
"preview/support.html"
]
},
+
"preview/landing/videos/first": {
"title": "",
"resources": [
"https://www.youtube.com/watch?v=CsulIu3UaUM"
]
},
+
+ "develop/performance/landing": {
+ "title": "",
+ "resources": [
+ "https://android-developers.blogspot.com/2010/07/multithreading-for-performance.html",
+ "https://www.udacity.com/course/ud825",
+ "https://www.youtube.com/watch?v=N72ksDKrX6c",
+ "https://developer.android.com/tools/performance/index.html",
+ "https://codelabs.developers.google.com/codelabs/android-perf-testing/index.html",
+ "https://developer.android.com/training/articles/memory.html",
+ ]
+ },
+
"preview/landing/more": {
"title": "",
"resources": [
diff --git a/docs/html/topic/performance/_book.yaml b/docs/html/topic/performance/_book.yaml
new file mode 100644
index 0000000000000..fb9c1d2ee594a
--- /dev/null
+++ b/docs/html/topic/performance/_book.yaml
@@ -0,0 +1,35 @@
+toc:
+- title: Optimizing Power Consumption
+ path: /topic/performance/power/index.html
+ section:
+ - title: Reducing Network Battery Drain
+ path: /topic/performance/power/network/index.html
+ path_attributes:
+ - name: description
+ value: Access the network while going easy on battery life.
+ section:
+ - title: Collecting Network Traffic Data
+ path: /topic/performance/power/network/gather-data.html
+ - title: Analyzing Network Traffic Data
+ path: /topic/performance/power/network/analyze-data.html
+ - title: Optimizing User-Initiated Network Use
+ path: /topic/performance/power/network/action-user-traffic.html
+ - title: Optimizing Server-Initiated Network Use
+ path: /topic/performance/power/network/action-server-traffic.html
+ - title: Optimizing General Network Use
+ path: /topic/performance/power/network/action-any-traffic.html
+ - title: Implementing Doze
+ path: /monitoring-device-state/doze-standby.html
+ path_attributes:
+ - name: description
+ value: Help ensure the device isn't depleting the battery when not in use.
+- title: Launch-Time Performance
+ path: /topic/performance/launch-time.html
+- title: Better Performance through Threading
+ path: /topic/performance/threads.html
+- title: Optimizing View Hierarchies
+ path: /topic/performance/optimizing-view-hierarchies.html
+- title: Intelligent Job-Scheduling
+ path: /topic/performance/scheduling.html
+- title: Reducing APK Size
+ path: /topic/performance/apk/reduce-apk-size.html
diff --git a/docs/html/topic/performance/index.jd b/docs/html/topic/performance/index.jd
new file mode 100644
index 0000000000000..8f64404e4e0c9
--- /dev/null
+++ b/docs/html/topic/performance/index.jd
@@ -0,0 +1,39 @@
+page.title=Performance
+page.article=true
+page.metaDescription=Android Performance does nice things. Details to come.
+
+meta.tags="performance"
+page.tags="performance"
+
+@jd:body
+
+
+
+Implementing a cool idea is a great start toward an app that delights users,
+but it's just the beginning. The next step is maximizing your app's performance.
+For example, users want apps that:
+
+
+ - Use power sparingly.
+ - Start up quickly.
+ - Respond quickly to user interaction.
+
+
+This section provides you with the know-how you need in order to make
+your apps not only cool, but also performant. Read on to discover how to
+develop apps that are power-thrifty, responsive, efficient, and well-behaved.
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/html/topic/performance/performance_toc.cs b/docs/html/topic/performance/performance_toc.cs
new file mode 100644
index 0000000000000..49191bcd85b5c
--- /dev/null
+++ b/docs/html/topic/performance/performance_toc.cs
@@ -0,0 +1,2289 @@
+
+ -
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/html/training/performance/battery/network/action-any-traffic.jd b/docs/html/topic/performance/power/network/action-any-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-any-traffic.jd
rename to docs/html/topic/performance/power/network/action-any-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-app-traffic.jd b/docs/html/topic/performance/power/network/action-app-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-app-traffic.jd
rename to docs/html/topic/performance/power/network/action-app-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-server-traffic.jd b/docs/html/topic/performance/power/network/action-server-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-server-traffic.jd
rename to docs/html/topic/performance/power/network/action-server-traffic.jd
diff --git a/docs/html/training/performance/battery/network/action-user-traffic.jd b/docs/html/topic/performance/power/network/action-user-traffic.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/action-user-traffic.jd
rename to docs/html/topic/performance/power/network/action-user-traffic.jd
diff --git a/docs/html/training/performance/battery/network/analyze-data.jd b/docs/html/topic/performance/power/network/analyze-data.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/analyze-data.jd
rename to docs/html/topic/performance/power/network/analyze-data.jd
diff --git a/docs/html/training/performance/battery/network/gather-data.jd b/docs/html/topic/performance/power/network/gather-data.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/gather-data.jd
rename to docs/html/topic/performance/power/network/gather-data.jd
diff --git a/docs/html/training/performance/battery/network/index.jd b/docs/html/topic/performance/power/network/index.jd
similarity index 100%
rename from docs/html/training/performance/battery/network/index.jd
rename to docs/html/topic/performance/power/network/index.jd
diff --git a/docs/html/training/auto/index.jd b/docs/html/training/auto/index.jd
index 0a7ceb34298d5..a0d0bb87457bd 100644
--- a/docs/html/training/auto/index.jd
+++ b/docs/html/training/auto/index.jd
@@ -8,7 +8,9 @@ page.metaDescription=Starting point for building apps for Auto, with guidelines,
@jd:body
-
+
+ Start the video course
The Android platform enables you to extend your app to work with in-vehicle console systems
@@ -27,7 +29,7 @@ page.metaDescription=Starting point for building apps for Auto, with guidelines,
For more information, follow the links below to learn how to extend your Android app to support
use in vehicles.
-
+
Get Started