Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2566 into donut

Browse Source 
* changes:
  Fix javadoc typos. No code changes.
This commit is contained in:
Android (Google) Code Review
2009-05-29 15:07:45 -07:00
parent 2d75410f20 982be3be05
commit f422dc495a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/TabHost.java
View File

@@ -87,8 +87,9 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode
/** /**
* <p>Call setup() before adding tabs if loading TabHost using findViewById(). <i><b>However</i></b>: You do * <p>Call setup() before adding tabs if loading TabHost using findViewById().
* not need to call setup() after getTabHost() in {@link android.app.TabActivity TabActivity}. * <i><b>However</i></b>: You do not need to call setup() after getTabHost()
* in {@link android.app.TabActivity TabActivity}.
* Example:</p> * Example:</p>
<pre>mTabHost = (TabHost)findViewById(R.id.tabhost); <pre>mTabHost = (TabHost)findViewById(R.id.tabhost);
mTabHost.setup(); mTabHost.setup();
@@ -363,14 +364,14 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
* *
* @param tag * @param tag
* Which tab was selected. * Which tab was selected.
* @return The view to distplay the contents of the selected tab. * @return The view to display the contents of the selected tab.
*/ */
View createTabContent(String tag); View createTabContent(String tag);
} }
/** /**
* A tab has a tab indictor, content, and a tag that is used to keep * A tab has a tab indicator, content, and a tag that is used to keep
* track of it. This builder helps choose among these options. * track of it. This builder helps choose among these options.
* *
* For the tab indicator, your choices are: * For the tab indicator, your choices are:
@@ -607,7 +608,7 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
} }
mLaunchedView = wd; mLaunchedView = wd;
// XXX Set FOCUS_AFTER_DESCENDANTS on embedded activies for now so they can get // XXX Set FOCUS_AFTER_DESCENDANTS on embedded activities for now so they can get
// focus if none of their children have it. They need focus to be able to // focus if none of their children have it. They need focus to be able to
// display menu items. // display menu items.
// //