Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs

Browse Source 
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
  docs: memory monitor duplicate paragraph
This commit is contained in:
Rich Slogar
2015-05-06 00:44:42 +00:00
committed by Android Git Automerger
parent d0551feed2 2febf6e0a5
commit 39b51b4968
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/tools/revisions/studio.jd
View File

@@ -50,7 +50,7 @@ Android Studio, as denoted by revision number. </p>
<p>Various fixes and enhancements:</p> <p>Various fixes and enhancements:</p>
<ul> <ul>
<li>Updated the Android runtime window to include the <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> 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 <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> performance data files, such as CPU method tracking and memory heap snapshots.</li>

7
docs/html/tools/studio/index.jd
View File

@@ -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 runtime window to launch the Android runtime window. Click the <strong>Memory</strong> or
<strong>CPU</strong> tab. </p> <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="" /> <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> <p class="img-caption"><strong>Figure 4.</strong> Monitor memory and CPU usage.</p>