summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics/firstapp/building-ui.jd
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-03-13 22:21:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-13 22:21:45 +0000
commit7e566239656c1de32a3bf695cd2ea3a28f1e906b (patch)
tree85e643947aa15f9fd9402d1176073bbb5c05e56a /docs/html/training/basics/firstapp/building-ui.jd
parentf7267c8bdc5431d486e8bb34722d492be82e44f3 (diff)
parent420d97fbc8eb573c1e200e9d3d46668b00990e7a (diff)
downloadframeworks_base-7e566239656c1de32a3bf695cd2ea3a28f1e906b.zip
frameworks_base-7e566239656c1de32a3bf695cd2ea3a28f1e906b.tar.gz
frameworks_base-7e566239656c1de32a3bf695cd2ea3a28f1e906b.tar.bz2
Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs
Diffstat (limited to 'docs/html/training/basics/firstapp/building-ui.jd')
-rw-r--r--docs/html/training/basics/firstapp/building-ui.jd7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 2615bee..179b3ac 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -75,16 +75,16 @@ content of the text field to another activity.</p>
<h2 id="LinearLayout">Create a Linear Layout</h2>
-<p>Open the <code>activity_main.xml</code> file from the <code>res/layout/</code>
+<p>Open the <code>fragment_main.xml</code> file from the <code>res/layout/</code>
directory.</p>
<p class="note"><strong>Note:</strong> In Eclipse, when you open a layout file, you’re first shown
the Graphical Layout editor. This is an editor that helps you build layouts using WYSIWYG tools. For this
-lesson, you’re going to work directly with the XML, so click the <em>activity_main.xml</em> tab at
+lesson, you’re going to work directly with the XML, so click the <em>fragment_main.xml</em> tab at
the bottom of the screen to open the XML editor.</p>
<p>The BlankActivity template you chose when you created this project includes the
-<code>activity_main.xml</code> file with a {@link
+<code>fragment_main.xml</code> file with a {@link
android.widget.RelativeLayout} root view and a {@link android.widget.TextView} child view.</p>
<p>First, delete the {@link android.widget.TextView &lt;TextView>} element and change the {@link
@@ -95,7 +95,6 @@ android:orientation}</a> attribute and set it to <code>"horizontal"</code>.
The result looks like this:</p>
<pre>
-&lt;?xml version="1.0" encoding="utf-8"?>
&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"