Merge "Docs: Fixed a typo" into mnc-io-docs
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 227c775..5990abd 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -384,7 +384,7 @@
});
// create chart image
- var $chart = $('<img style="margin-left:30px" alt="" src="' + set.chart + '" />');
+ var $chart = $('<img style="margin-left:30px" alt="" data-dac-src="' + set.chart + '" />');
// stack up and insert the elements
$divtable.append($table);
@@ -451,9 +451,9 @@
$table.append($tr);
// create charts
- var $sizechart = $('<img style="float:left;width:380px" alt="" src="'
+ var $sizechart = $('<img style="float:left;width:380px" alt="" data-dac-src="'
+ set.layoutchart + '" />');
- var $densitychart = $('<img style="float:left;width:380px" alt="" src="'
+ var $densitychart = $('<img style="float:left;width:380px" alt="" data-dac-src="'
+ set.densitychart + '" />');
// stack up and insert the elements
@@ -461,6 +461,16 @@
$("#screens-chart").append($div);
});
+ // TODO (akassay): Remove this.
+ // I replaced the src attributes in the javascript above with data-dac-src
+ // so the value would not be molested by the DevSite parser. So this code here
+ // moves that src value into a real src attribute at runtime. This should be
+ // removed once we either move this script out of the content body or update
+ // the parser to not modify src attributes in <script> tags.
+ $('img[data-dac-src]').each(function() {
+ var src = $(this).attr('data-dac-src');
+ $(this).attr('src', src);
+ });
});
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index b3ceee3..027ba23 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -50,42 +50,6 @@
</div>
</section>
-<section class="dac-section dac-light"><div class="wrap">
- <h1 class="dac-section-title">Google APIs and services</h1>
- <div class="dac-section-subtitle">
- Add the latest Google-powered features to enrich your app,
- grow your user base, and monetize.
- </div>
- <div class="resource-widget resource-flow-layout col-16"
- data-query="collection:google/landing/services"
- data-cardSizes="6x6"
- data-maxResults="6"></div>
- <ul class="dac-section-links">
- <li class="dac-section-link"><a href="https://developers.google.com/android/">
- <span class="dac-sprite dac-auto-chevron"></span>
- More Google services for Android
- </a></li>
- </ul>
- </div>
-</section>
-
-<section class="dac-section dac-gray dac-small" id="videos"><div class="wrap">
- <h2 class="norule">Videos</h2>
- <div class="resource-widget resource-flow-layout col-16"
- data-query="collection:google/landing/videos"
- data-sortOrder="-timestamp"
- data-cardSizes="6x6"
- data-maxResults="3"></div>
- </div>
- <ul class="dac-section-links">
- <li class="dac-section-link"><a href="https://www.youtube.com/playlist?list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf">
- <span class="dac-sprite dac-auto-chevron"></span>
- Playlist
- </a></li>
- </ul>
-
-</section>
-
<section class="dac-section dac-invert dac-darken-bg" style="background-image: url(/images/distribute/google-play-bg.jpg)"><div class="wrap">
<h1 class="dac-section-title">Google Play developer tools</h1>
<div class="dac-section-subtitle">
diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd
index 8ffb45c..e666bc6 100755
--- a/docs/html/google/play/billing/billing_integrate.jd
+++ b/docs/html/google/play/billing/billing_integrate.jd
@@ -150,8 +150,8 @@
</p>
<p>
- To give your app the necessary permission, add this line in your {@code
- Android.xml} manifest file:
+ To give your app the necessary permission, add this line in the {@code
+ AndroidManifest.xml} file:
</p>
<pre>
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index 6485186..c85ef7e 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -89,7 +89,7 @@
},
{
"title":"Network Monitor",
- "summary":"The Network Monitor makes it possible to track when your application is making network requests. Using this tool, you can monitor how and when your app transfers data, and optimize the underlying code appropriately. By monitoring the frequency of data\u2026",
+ "summary":"Use the Network Monitor to analyze network requests, including how and when your app transfers data. Preserve battery life by optimizing network use.",
"url":"studio/profile/am-network.html",
"image":"images/tools/thumbnails/am-networkmon.png",
"type":"studio",
@@ -99,7 +99,7 @@
},
{
"title":"Memory Monitor",
- "summary":"Android Studio provides a Memory Monitor so you can more easily monitor app performance and memory usage to find deallocated objects, locate memory leaks, and track the amount of memory the connected device is using. The Memory Monitor reports how your\u2026",
+ "summary":"Use the Memory Monitor to evaluate memory usage and find deallocated objects, locate memory leaks, and track the amount of memory the connected device is using.",
"url":"studio/profile/am-memory.html",
"image":"images/tools/thumbnails/am-memorymon.png",
"type":"studio",
@@ -118,7 +118,7 @@
},
{
"title":"CPU Monitor",
- "summary":"The CPU Monitor lets you easily monitor the central processing unit (CPU) usage of your app. It displays CPU usage in real time and displays the percentage of total CPU time (including all cores) used by user and kernel mode. In user mode, the code must\u2026",
+ "summary":"Use the CPU Monitor to display CPU usage in real time and the percentage of total CPU time (including all cores) used in user and kernel mode.",
"url":"studio/profile/am-cpu.html",
"image":"images/tools/thumbnails/am-cpumon.png",
"type":"studio",
@@ -137,7 +137,7 @@
},
{
"title":"logcat Monitor",
- "summary":"The Android logging system provides a mechanism for collecting and viewing system debug output. logcat Monitor displays messages that you added to your app by using the Log class, as well as system messages, such as stack traces when the emulator throws\u2026",
+ "summary":"Use the logcat Monitor to view system and user-defined log messages. You can filter the messages to display just the items that interest you.",
"url":"studio/debug/am-logcat.html",
"image":"images/tools/thumbnails/am-logcatmon2.png",
"type":"studio",
@@ -147,7 +147,7 @@
},
{
"title":"GPU Monitor",
- "summary":"The GPU Monitor gives you a quick visual representation of how much time it takes to render the frames of a UI window. It profiles the amount of time it takes for the render thread to prepare, process, and execute the draw commands. The GPU Monitor can\u2026",
+ "summary":"Use the GPU Monitor for a visual representation of how much time it takes to render the frames of a UI window. Use this information to optimize the code that displays graphics and conserve memory.",
"url":"studio/profile/am-gpu.html",
"image":"images/tools/thumbnails/am-gpumon.png",
"type":"studio",
@@ -3948,26 +3948,6 @@
"https://www.youtube.com/watch?v=5Be2mJzP-Uw&list=PLWz5rJ2EKKc9e0d55YHgJFHXNZbGHEXJX"
]
},
- "google/landing/services": {
- "title": "",
- "resources": [
- "https://developers.google.com/analytics/devguides/collection/android/",
- "https://developers.google.com/maps/documentation/android/",
- "https://developers.google.com/identity/sign-in/android/",
- "https://developers.google.com/mobile-ads-sdk/download",
- "https://developers.google.com/cloud-messaging/gcm",
- "https://developers.google.com/app-indexing/"
- ]
- },
- "google/landing/videos": {
- "title": "",
- "resources": [
- "https://www.youtube.com/watch?v=M3Udfu6qidk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
- "https://www.youtube.com/watch?v=FOn64iqlphk&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
- "https://www.youtube.com/watch?v=F0Kh_RnSM0w&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf",
- "https://www.youtube.com/watch?v=fvtMtfCuEpw&list=PLWz5rJ2EKKc9Qk1_iCZNbBp6adYnJf9Vf"
- ]
- },
"google/landing/googleplay": {
"title": "",
"resources": [
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index c643dc7..ab2b5ba 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -824,9 +824,9 @@
<p>
For more information, read the Android Studio documents that describe how to
- <a href="{@docRoot}studio/tools/publishing/app-signing.html#release-mode">
+ <a href="{@docRoot}studio/publish/app-signing.html#release-mode">
sign an app</a> in Android Studio and how to <a href=
- "{@docRoot}studio/tools/building/configuring-gradle.html#signing"> configure
+ "{@docRoot}studio/build/build-variants.html#signing"> configure
the build file for signing apps</a> using the Android Plugin for Gradle.
</p>
diff --git a/docs/html/wear/preview/features/complications.jd b/docs/html/wear/preview/features/complications.jd
index a0157de..d33fd2a 100644
--- a/docs/html/wear/preview/features/complications.jd
+++ b/docs/html/wear/preview/features/complications.jd
@@ -370,13 +370,13 @@
<table>
<tr>
- <th>
+ <th style="width:175px">
Type
</th>
- <th>
+ <th style="width:175px">
Required fields
</th>
- <th>
+ <th style="width:175px">
Optional fields
</th>
<th>
@@ -491,13 +491,13 @@
<table>
<tr>
- <th>
+ <th style="width:175px">
Type
</th>
- <th>
+ <th style="width:175px">
Required fields
</th>
- <th>
+ <th style="width:175px">
Optional fields
</th>
<th>
@@ -557,7 +557,7 @@
<table>
<tr>
- <th>
+ <th style="width:175px">
Field
</th>
<th>