diff options
| author | Rich Slogar <rslogar@google.com> | 2015-01-16 11:56:55 -0800 |
|---|---|---|
| committer | Rich Slogar <rslogar@google.com> | 2015-01-16 11:56:55 -0800 |
| commit | 21d940c3cf530b4b58174d63340392b1aa45ec3d (patch) | |
| tree | 9a4007de2327091ae4c99ecfbcf7cf8d76698e43 /docs/html/tools/studio | |
| parent | 98f6bf4c1c824af477b66d67e2dd8beb54387f55 (diff) | |
| parent | 20e7ab8667845d9c0bfdc329893bb50e5db7edbe (diff) | |
| download | frameworks_base-21d940c3cf530b4b58174d63340392b1aa45ec3d.zip frameworks_base-21d940c3cf530b4b58174d63340392b1aa45ec3d.tar.gz frameworks_base-21d940c3cf530b4b58174d63340392b1aa45ec3d.tar.bz2 | |
resolved conflicts for merge of 20e7ab86 to master
Change-Id: I346419455a1a97c3eddb639188bcd81593887e97
Diffstat (limited to 'docs/html/tools/studio')
| -rw-r--r-- | docs/html/tools/studio/index.jd | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd index 9ee2f9a..9f24008 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -410,15 +410,13 @@ UI versions). Also, the new drawable XML tags and attributes, such as <ripple and <animated-selector>, are supported.</p> -<h3> Easy access to Android code samples on GitHub</h3> +<h3 id="git-samples"> Easy access to Android code samples on GitHub</h3> <p>Clicking <strong>Import Samples</strong> from the <strong>File</strong> menu or Welcome page provides seamless access to Google code samples on GitHub.</p> <p><img src="{@docRoot}images/tools/studio-samples-githubaccess.png" /></p> <p class="img-caption"><strong>Figure 12.</strong> Code Sample Access</p> - - - - + <p><img src="{@docRoot}images/tools/studio-sample-in-editor.png" /></p> + <p class="img-caption"><strong>Figure 13.</strong> Imported Code Sample</p> |