summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-03-12 01:07:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-12 01:07:20 +0000
commit1a27a3fb4eceefcf412218d73de0cff0cc68c67d (patch)
tree2701b29b0823ebe817c2ec74c7f0753c6d9c294a
parent65215edd7acada70c2bcb060daec6ff718ae92ba (diff)
parent4600588868b7df38084915793db8eeb38e90ca5a (diff)
downloadframeworks_base-1a27a3fb4eceefcf412218d73de0cff0cc68c67d.zip
frameworks_base-1a27a3fb4eceefcf412218d73de0cff0cc68c67d.tar.gz
frameworks_base-1a27a3fb4eceefcf412218d73de0cff0cc68c67d.tar.bz2
am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '4600588868b7df38084915793db8eeb38e90ca5a': docs: build image updates
-rw-r--r--docs/html/images/tools/as-gradleconsole.pngbin29196 -> 0 bytes
-rw-r--r--docs/html/images/tools/as-gradlepanel.pngbin33680 -> 0 bytes
-rw-r--r--docs/html/images/tools/studio-gradle-console.pngbin0 -> 20850 bytes
-rw-r--r--docs/html/images/tools/studio-gradle-panel.pngbin0 -> 21009 bytes
-rw-r--r--docs/html/tools/building/building-studio.jd12
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/images/tools/as-gradleconsole.png b/docs/html/images/tools/as-gradleconsole.png
deleted file mode 100644
index c676c94..0000000
--- a/docs/html/images/tools/as-gradleconsole.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/tools/as-gradlepanel.png b/docs/html/images/tools/as-gradlepanel.png
deleted file mode 100644
index a409462..0000000
--- a/docs/html/images/tools/as-gradlepanel.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/tools/studio-gradle-console.png b/docs/html/images/tools/studio-gradle-console.png
new file mode 100644
index 0000000..a2b708c
--- /dev/null
+++ b/docs/html/images/tools/studio-gradle-console.png
Binary files differ
diff --git a/docs/html/images/tools/studio-gradle-panel.png b/docs/html/images/tools/studio-gradle-panel.png
new file mode 100644
index 0000000..4a76a8d
--- /dev/null
+++ b/docs/html/images/tools/studio-gradle-panel.png
Binary files differ
diff --git a/docs/html/tools/building/building-studio.jd b/docs/html/tools/building/building-studio.jd
index cb8cc50..68800da 100644
--- a/docs/html/tools/building/building-studio.jd
+++ b/docs/html/tools/building/building-studio.jd
@@ -52,10 +52,10 @@ progress of the build:</p>
<p>Click <img src="{@docRoot}images/tools/as-gradlebutton.png" alt=""
style="vertical-align:bottom;margin:0;"/> on the bottom
-right part of the window to show the <em>Gradle Console</em>, as shown in figure 2.</p>
+right part of the window to show the <em>Gradle Console</em>, as shown in figure 1.</p>
-<img src="{@docRoot}images/tools/as-gradleconsole.png" alt="" />
-<p class="img-caption"><strong>Figure 2.</strong> The Gradle Console in Android Studio.</p>
+<img src="{@docRoot}images/tools/studio-gradle-console.png" alt="" />
+<p class="img-caption"><strong>Figure 1.</strong> The Gradle Console in Android Studio.</p>
<p>The Gradle Console shows the build tasks and subtasks that the build system runs for
Android Studio. If the build fails, you can find more details on the console. To hide the Gradle
@@ -68,11 +68,11 @@ selected build variant. For more information, see the
<p>To view the list of all available build tasks in Android Studio, click <strong>Gradle</strong>
on the right side of the IDE window. The <em>Gradle tasks</em> panel appears as shown in
-figure 3. Double-click any build task to run it in Android Studio. To hide the <em>Gradle tasks</em>
+figure 2. Double-click any build task to run it in Android Studio. To hide the <em>Gradle tasks</em>
panel, click <strong>Gradle</strong> again.</p>
-<img src="{@docRoot}images/tools/as-gradlepanel.png" alt="" />
-<p class="img-caption"><strong>Figure 3.</strong> The list of build tasks in Android Studio.</p>
+<img src="{@docRoot}images/tools/studio-gradle-panel.png" alt="" />
+<p class="img-caption"><strong>Figure 2.</strong> The list of build tasks in Android Studio.</p>
<h3 id="buildRelease">Build a release version</h3>