diff options
| author | Rich Slogar <rslogar@google.com> | 2015-05-06 00:44:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-06 00:44:42 +0000 |
| commit | 39b51b4968c0aeeef84d5d75ef683516e658a30d (patch) | |
| tree | 7c312a7fdf1f0f171c0934fa08207d8c946c0fd4 /docs | |
| parent | d0551feed28614dad957a09998522b25392ce621 (diff) | |
| parent | 2febf6e0a5bd9f716005c256f7357c6f44b52c2b (diff) | |
| download | frameworks_base-39b51b4968c0aeeef84d5d75ef683516e658a30d.zip frameworks_base-39b51b4968c0aeeef84d5d75ef683516e658a30d.tar.gz frameworks_base-39b51b4968c0aeeef84d5d75ef683516e658a30d.tar.bz2 | |
am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
docs: memory monitor duplicate paragraph
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/tools/revisions/studio.jd | 2 | ||||
| -rw-r--r-- | docs/html/tools/studio/index.jd | 7 |
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 96e4316..0cf578d 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -283,13 +283,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> |