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

am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

Browse Source 
* commit 'd5db0f63b4cf03294c2871eb3bf9d3b944700788':
  docs: Misc. fixes for M Preview docs.
This commit is contained in:
Quddus Chong
2015-05-28 21:05:02 +00:00
committed by Android Git Automerger
parent 2836b863fb d5db0f63b4
commit 7138643f41
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/html/preview/api-overview.jd
View File

@@ -165,11 +165,11 @@ method to re-authenticate the user within your app.
<p>To see an app implementation of this feature, refer to the <p>To see an app implementation of this feature, refer to the
<a href="https://github.com/googlesamples/android-ConfirmCredentials" class="external-link"> <a href="https://github.com/googlesamples/android-ConfirmCredentials" class="external-link">
Confirm Device Credentials sample</a>.</p> Confirm Credentials sample</a>.</p>
<h2 id="direct-share">Direct Share</h2> <h2 id="direct-share">Direct Share</h2>
<img src="{@docRoot}preview/images/direct-share-screen_2x.png" <img src="{@docRoot}preview/images/direct-share-screen.png"
srcset="{@docRoot}preview/images/direct-share-screen.png 1x, preview/images/direct-share-screen_2x.png 2x" srcset="{@docRoot}preview/images/direct-share-screen.png 1x, preview/images/direct-share-screen_2x.png 2x"
style="float:right; margin:0 0 20px 30px" width="312" height="335" /> style="float:right; margin:0 0 20px 30px" width="312" height="335" />

12
docs/html/preview/testing/performance.jd
View File

@@ -554,10 +554,10 @@ Number Slow draw: 23342
</h4> </h4>
<p> <p>
Tool suites like <a href= Tool suites, like <a href=
"https://developer.android.com/tools/testing-support-library/index.html">UIAutomator</a>, "{@docRoot}training/testing/ui-testing/uiautomator-testing.html">UI Automator</a> and
and <a href="https://code.google.com/p/android-test-kit/">Espresso</a> are built to help <a href="{@docRoot}training/testing/ui-testing/espresso-testing.html">Espresso</a>, are
automate the action of a user moving through your application. These are simple built to help automate the action of a user moving through your application. These are simple
frameworks which mimic user interaction with your device. To use these frameworks, you frameworks which mimic user interaction with your device. To use these frameworks, you
effectively create unique scripts, which run through a set of user-actions, and play them effectively create unique scripts, which run through a set of user-actions, and play them
out on the device itself. out on the device itself.
@@ -585,7 +585,7 @@ Number Slow draw: 23342
<p> <p>
It’s worth noting that UI testing frameworks (like <a href= It’s worth noting that UI testing frameworks (like <a href=
"https://developer.android.com/tools/testing-support-library/index.html">UIAutomator</a>) "{@docRoot}training/testing/ui-testing/uiautomator-testing.html">UI Automator</a>)
run on the target device/emulator directly. While performance gathering information done run on the target device/emulator directly. While performance gathering information done
by <em>dumpsys gfxinfo</em> is driven by a host machine, sending commands over ADB. To by <em>dumpsys gfxinfo</em> is driven by a host machine, sending commands over ADB. To
help bridge the automation of these separate entities, <a href= help bridge the automation of these separate entities, <a href=
@@ -595,7 +595,7 @@ Number Slow draw: 23342
</p> </p>
<p> <p>
Building a set of scripts for proper Automation of UI Performance testing, at a minimum, Building a set of scripts for proper automation of UI Performance testing, at a minimum,
should be able to utilize monkeyRunner to accomplish the following tasks: should be able to utilize monkeyRunner to accomplish the following tasks:
</p> </p>