diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-06-30 17:57:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-30 17:57:36 +0000 |
| commit | 8722e1416ed04fbd0122c394c7fdad9d41524c60 (patch) | |
| tree | d05718fe8cefa7c1273c0eebc9956dff6f5af2ac | |
| parent | 40dff5b47f52ffb648f51c395ae67193e3121a2c (diff) | |
| parent | 4653cdecab5eb6b08f23183f83034ccf50e93451 (diff) | |
| download | frameworks_base-8722e1416ed04fbd0122c394c7fdad9d41524c60.zip frameworks_base-8722e1416ed04fbd0122c394c7fdad9d41524c60.tar.gz frameworks_base-8722e1416ed04fbd0122c394c7fdad9d41524c60.tar.bz2 | |
am 4653cdec: am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '4653cdecab5eb6b08f23183f83034ccf50e93451':
docs: Clarified when you can put the fragments in the root view.
| -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> |