summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-10-02 19:42:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 19:42:11 +0000
commit7a9ecfb0dea253c311c25296052d5a4edb9700a7 (patch)
treec9ca2b8ca157dabc867ddbd8de729836640f0f42 /docs
parent1d6ca80ed6a27e324e52b8b944ef64dc07a92e34 (diff)
parentaaf38de492a669eb91e04236f0b1004c5c6241af (diff)
downloadframeworks_base-7a9ecfb0dea253c311c25296052d5a4edb9700a7.zip
frameworks_base-7a9ecfb0dea253c311c25296052d5a4edb9700a7.tar.gz
frameworks_base-7a9ecfb0dea253c311c25296052d5a4edb9700a7.tar.bz2
am aaf38de4: am 629e2f54: am 94f04cbe: am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev
* commit 'aaf38de492a669eb91e04236f0b1004c5c6241af': fix confusing sentence https://memegen.googleplex.com/5524829602054144
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/basics/fragments/fragment-ui.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd
index 14469bf..4fa5b70 100644
--- a/docs/html/training/basics/fragments/fragment-ui.jd
+++ b/docs/html/training/basics/fragments/fragment-ui.jd
@@ -66,9 +66,9 @@ and perform other fragment transactions.</p>
initial fragment(s) to the activity during the activity's
{@link android.app.Activity#onCreate onCreate()} method.</p>
-<p>An important rule when dealing with fragments&mdash;especially those that you add at
-runtime&mdash;is that the fragment must have a container {@link android.view.View} in the layout in
-which the fragment's layout will reside.</p>
+<p>An important rule when dealing with fragments&mdash;especially when adding fragments at
+runtime&mdash;is that your activity layout must include a container {@link android.view.View}
+in which you can insert the fragment.</p>
<p>The following layout is an alternative to the layout shown in the <a
href="creating.html">previous lesson</a> that shows only one fragment at a time. In order to replace