diff options
author | Andrew Solovay <asolovay@google.com> | 2015-06-29 21:42:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 21:42:48 +0000 |
commit | 350286e613cdde99f347bd115c406e790a242f87 (patch) | |
tree | 794338cf2cad050ba6b5985b8461b5451b3d6164 /docs/html | |
parent | 3686e0430f8366e2f4de867eeabfd1b7fe4aefc0 (diff) | |
parent | d043297ef4e95c5313f5ea41f937d4835c23920b (diff) | |
download | frameworks_base-350286e613cdde99f347bd115c406e790a242f87.zip frameworks_base-350286e613cdde99f347bd115c406e790a242f87.tar.gz frameworks_base-350286e613cdde99f347bd115c406e790a242f87.tar.bz2 |
Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
Diffstat (limited to 'docs/html')
-rw-r--r-- | docs/html/guide/topics/ui/actionbar.jd | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index d972c47..b2f98ad 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -907,11 +907,7 @@ to ensure the best fit in the action bar.</p> <p>To get started, your layout must include a {@link android.view.ViewGroup} in which you place each {@link android.app.Fragment} associated with a tab. Be sure the {@link android.view.ViewGroup} has a resource ID so you can reference it from your code and swap the tabs within it. -Alternatively, if the tab content will fill the activity layout, then your activity doesn't need a -layout at all (you don't even need to call {@link android.app.Activity#setContentView -setContentView()}). Instead, you can place each fragment in the default root view, which you can -refer to with the {@code android.R.id.content} ID.</p> - +</p> <p>Once you determine where the fragments appear in the layout, the basic procedure to add tabs is:</p> |