summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-05-06 01:24:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-06 01:24:27 +0000
commit5464b5ca62f9c8bb7b76872fad74ba0387319fd3 (patch)
tree8816a9b6069d9375d683be1ed4827ae4ef8e6ced /docs
parent138ab38141614e28a5936b3cefcfc6607ec30dcf (diff)
parentcc4a29807e679a1691a949c117f540867304acc7 (diff)
downloadframeworks_base-5464b5ca62f9c8bb7b76872fad74ba0387319fd3.zip
frameworks_base-5464b5ca62f9c8bb7b76872fad74ba0387319fd3.tar.gz
frameworks_base-5464b5ca62f9c8bb7b76872fad74ba0387319fd3.tar.bz2
am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit 'cc4a29807e679a1691a949c117f540867304acc7': docs: memory monitor duplicate paragraph
Diffstat (limited to 'docs')
-rw-r--r--docs/html/tools/revisions/studio.jd2
-rw-r--r--docs/html/tools/studio/index.jd7
2 files changed, 1 insertions, 8 deletions
diff --git a/docs/html/tools/revisions/studio.jd b/docs/html/tools/revisions/studio.jd
index 4f153e3..f530a5f 100644
--- a/docs/html/tools/revisions/studio.jd
+++ b/docs/html/tools/revisions/studio.jd
@@ -50,7 +50,7 @@ Android Studio, as denoted by revision number. </p>
<p>Various fixes and enhancements:</p>
<ul>
<li>Updated the Android runtime window to include the
- <a href="{@docRoot}tools/studio/index.html#memory-monitor">Memory Monitor</a> tool
+ <a href="{@docRoot}tools/studio/index.html#mem-cpu">Memory Monitor</a> tool
and added a tab for CPU performance monitoring.</li>
<li>Added a <em>Captures</em> tab in the left margin to display the captured memory and CPU
performance data files, such as CPU method tracking and memory heap snapshots.</li>
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 95cdb76..db3fce2 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -282,13 +282,6 @@ device or emulator, click the <strong>Android</strong> tab in the lower left cor
runtime window to launch the Android runtime window. Click the <strong>Memory</strong> or
<strong>CPU</strong> tab. </p>
-
-<h3 id="memory-monitor">Memory Monitor</h3>
-<p>Android Studio provides a memory monitor view so you can more easily monitor your
-app's memory usage to find deallocated objects, locate memory leaks and track the amount of
-memory the connected device is using. With your app running on a device or emulator, click the
-<strong>Memory Monitor</strong> tab in the lower right corner to launch the memory monitor. </p>
-
<img src="{@docRoot}images/tools/studio-memory-monitor.png" srcset="{@docRoot}images/tools/studio-memory-monitor_2x.png 2x" width"635" height="171" alt="" />
<p class="img-caption"><strong>Figure 4.</strong> Monitor memory and CPU usage.</p>