diff options
| author | David Friedman <dmail@google.com> | 2015-02-23 14:40:41 -0800 |
|---|---|---|
| committer | David Friedman <dmail@google.com> | 2015-02-23 14:40:48 -0800 |
| commit | 704ebab343b80ca8d483a7a35d690cbae58475d5 (patch) | |
| tree | 745becdc12390942b2076418289b9db9c576177f /docs/html/tools/studio | |
| parent | 6a8253fdc9f4574c28b4beeeed90580ffc93734a (diff) | |
| parent | 6248cdd588ba881b4bbd4b7d39dea69b157342db (diff) | |
| download | frameworks_base-704ebab343b80ca8d483a7a35d690cbae58475d5.zip frameworks_base-704ebab343b80ca8d483a7a35d690cbae58475d5.tar.gz frameworks_base-704ebab343b80ca8d483a7a35d690cbae58475d5.tar.bz2 | |
resolved conflicts for merge of 6248cdd5 to master
Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b
Diffstat (limited to 'docs/html/tools/studio')
| -rw-r--r-- | docs/html/tools/studio/index.jd | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd index 9e7721b..1860feb 100644 --- a/docs/html/tools/studio/index.jd +++ b/docs/html/tools/studio/index.jd @@ -96,10 +96,9 @@ top level of the project hierarchy and contains these three elements at the top <p>For example, <em>Android</em> project view groups all the instances of the <code>ic_launcher.png</code> resource for different screen densities under the same element.</p> -<p class="note"><strong>Note:</strong> The project structure on disk differs from this flattened -representation. To switch to back the segregated project view, select <strong>Project</strong> from -the <strong>Project</strong drop-down. </p> - +<p class="note"><strong>Note:</strong> The project structure on disk differs from this flattened +representation. To switch to back to the segregated project view, select <strong>Project</strong> from +the <strong>Project</strong> drop-down. </p> <h3>Android Studio Project and Directory Structure</h3> @@ -182,7 +181,7 @@ uniquely identify application packages for publishing. The application ID is set <p class="note"><strong>Note:</strong> The <em>applicationId</em> is specified only in your build.gradle file, and not in the AndroidManifest.xml file.</p> -<p>When using build variants, the build system enables you to to uniquely identify different +<p>When using build variants, the build system enables you to uniquely identify different packages for each product flavors and build types. The application ID in the build type is added as a suffix to those specified for the product flavors. </p> |