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

Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-29 20:31:02 +00:00
committed by Android (Google) Code Review
parent 88442c1fe1 3c5a1c8124
commit c295a4b23d
2 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/TabActivity.java
View File

@@ -28,23 +28,6 @@ import android.widget.TextView;
* {@link ActionBar#newTab() ActionBar.newTab()} and
* related APIs for placing tabs within their action bar area.</p>
*
* <p>A replacement for TabActivity can also be implemented by directly using
* TabHost. You will need to define a layout that correctly uses a TabHost
* with a TabWidget as well as an area in which to display your tab content.
* A typical example would be:</p>
*
* {@sample development/samples/Support4Demos/res/layout/fragment_tabs.xml complete}
*
* <p>The implementation needs to take over responsibility for switching
* the shown content when the user switches between tabs.
*
* {@sample development/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
* complete}
*
* <p>Also see the <a href="{@docRoot}resources/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabsPager.html">
* Fragment Tabs Pager</a> sample for an example of using the support library's ViewPager to
* allow the user to swipe the content to switch between tabs.</p>
*
* @deprecated New applications should use Fragments instead of this class;
* to continue to run on older devices, you can use the v4 support library
* which provides a version of the Fragment API that is compatible down to

29
core/java/com/android/internal/widget/ViewPager.java
View File

@@ -55,34 +55,7 @@ import java.util.Collections;
import java.util.Comparator;
/**
* Layout manager that allows the user to flip left and right
* through pages of data. You supply an implementation of a
* {@link android.support.v4.view.PagerAdapter} to generate the pages that the view shows.
*
* <p>Note this class is currently under early design and
* development. The API will likely change in later updates of
* the compatibility library, requiring changes to the source code
* of apps when they are compiled against the newer version.</p>
*
* <p>ViewPager is most often used in conjunction with {@link android.app.Fragment},
* which is a convenient way to supply and manage the lifecycle of each page.
* There are standard adapters implemented for using fragments with the ViewPager,
* which cover the most common use cases. These are
* {@link android.support.v4.app.FragmentPagerAdapter} and
* {@link android.support.v4.app.FragmentStatePagerAdapter}; each of these
* classes have simple code showing how to build a full user interface
* with them.
*
* <p>For more information about how to use ViewPager, read <a
* href="{@docRoot}training/implementing-navigation/lateral.html">Creating Swipe Views with
* Tabs</a>.</p>
*
* <p>Below is a more complicated example of ViewPager, using it in conjunction
* with {@link android.app.ActionBar} tabs. You can find other examples of using
* ViewPager in the API 4+ Support Demos and API 13+ Support Demos sample code.
*
* {@sample development/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java
* complete}
* Framework copy of the support-v4 ViewPager class.
*/
public class ViewPager extends ViewGroup {
private static final String TAG = "ViewPager";