Merge "Docs: Performance final changes" into nyc-dev

docs/html/jd_extras_en.js

@@ -3648,7 +3648,7 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "group":"",
     "keywords": ["android, performance","profiling"],
     "tags": ["android, performance"],
-    "image":"/assets/images/resource-card-default-android.jpg",
+    "image": null,
     "lang":"en",
     "type":"develop"
   },
@@ -3661,7 +3661,7 @@ METADATA['en'].extras = METADATA['en'].extras.concat([
     "group":"",
     "keywords": ["android, performance","profiling"],
     "tags": ["android, performance"],
-    "image":"/assets/images/resource-card-default-android.jpg",
+    "image": null,
     "lang":"en",
     "type":"develop"
   },
@@ -5446,9 +5446,9 @@ METADATA['en'].collections = {
       "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",
+      "tools/performance/index.html",
       "https://codelabs.developers.google.com/codelabs/android-perf-testing/index.html",
-      "https://developer.android.com/training/articles/memory.html",
+      "training/articles/memory.html",
     ]
   },
 

docs/html/topic/performance/_book.yaml

@@ -1,28 +1,25 @@
 toc:
-- title: Optimizing Power Consumption
-  path: /topic/performance/power/index.html
+- 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: 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: 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: /training/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
@@ -32,4 +29,4 @@ toc:
 - title: Intelligent Job-Scheduling
   path: /topic/performance/scheduling.html
 - title: Reducing APK Size
-  path: /topic/performance/apk/reduce-apk-size.html
+  path: /topic/performance/reduce-apk-size.html

docs/html/topic/performance/index.jd

@@ -34,6 +34,6 @@ develop apps that are power-thrifty, responsive, efficient, and well-behaved.</p
        data-cardSizes="6x6"
        data-maxResults="24"
        data-items-per-page="24"
-       data-initial-results="6"></div>
+       data-initial-results="3"></div>
   </div>
-</section>
+</section>