LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1

Browse Source 
* commit '170b26ba32bd86df929a8a27fefde91a114f3831':
  SDK only: add markup for use in documentation.
This commit is contained in:
Dianne Hackborn
2011-12-12 16:10:57 -08:00
committed by Android Git Automerger
parent 705c46ec3f 170b26ba32
commit 100dc50d0b
9 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Support13Demos/res/layout/fragment_pager.xml
View File

@@ -16,6 +16,7 @@
<!-- Top-level content view for the simple fragment sample. --> <!-- Top-level content view for the simple fragment sample. -->
<!-- BEGIN_INCLUDE(complete) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:padding="4dip" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -42,3 +43,4 @@
</Button> </Button>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- END_INCLUDE(complete) -->

2
samples/Support13Demos/res/layout/fragment_pager_list.xml
View File

@@ -14,6 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<!-- BEGIN_INCLUDE(complete) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -50,3 +51,4 @@
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<!-- END_INCLUDE(complete) -->

2
samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java
View File

@@ -33,6 +33,7 @@ import android.support.v4.view.ViewPager;
* This demonstrates the use of action bar tabs and how they interact * This demonstrates the use of action bar tabs and how they interact
* with other action bar features. * with other action bar features.
*/ */
//BEGIN_INCLUDE(complete)
public class ActionBarTabsPager extends Activity { public class ActionBarTabsPager extends Activity {
ViewPager mViewPager; ViewPager mViewPager;
TabsAdapter mTabsAdapter; TabsAdapter mTabsAdapter;
@@ -157,3 +158,4 @@ public class ActionBarTabsPager extends Activity {
} }
} }
} }
//END_INCLUDE(complete)

2
samples/Support13Demos/src/com/example/android/supportv13/app/FragmentPagerSupport.java
View File

@@ -37,6 +37,7 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
//BEGIN_INCLUDE(complete)
public class FragmentPagerSupport extends Activity { public class FragmentPagerSupport extends Activity {
static final int NUM_ITEMS = 10; static final int NUM_ITEMS = 10;
@@ -138,3 +139,4 @@ public class FragmentPagerSupport extends Activity {
} }
} }
} }
//END_INCLUDE(complete)

2
samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
View File

@@ -37,6 +37,7 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
//BEGIN_INCLUDE(complete)
public class FragmentStatePagerSupport extends Activity { public class FragmentStatePagerSupport extends Activity {
static final int NUM_ITEMS = 10; static final int NUM_ITEMS = 10;
@@ -138,3 +139,4 @@ public class FragmentStatePagerSupport extends Activity {
} }
} }
} }
//END_INCLUDE(complete)

2
samples/Support4Demos/res/layout/fragment_pager.xml
View File

@@ -16,6 +16,7 @@
<!-- Top-level content view for the simple fragment sample. --> <!-- Top-level content view for the simple fragment sample. -->
<!-- BEGIN_INCLUDE(complete) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:padding="4dip" android:orientation="vertical" android:padding="4dip"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@@ -42,3 +43,4 @@
</Button> </Button>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- END_INCLUDE(complete) -->

2
samples/Support4Demos/res/layout/fragment_pager_list.xml
View File

@@ -14,6 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<!-- BEGIN_INCLUDE(complete) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -50,3 +51,4 @@
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<!-- END_INCLUDE(complete) -->

2
samples/Support4Demos/src/com/example/android/supportv4/app/FragmentPagerSupport.java
View File

@@ -36,6 +36,7 @@ import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
//BEGIN_INCLUDE(complete)
public class FragmentPagerSupport extends FragmentActivity { public class FragmentPagerSupport extends FragmentActivity {
static final int NUM_ITEMS = 10; static final int NUM_ITEMS = 10;
@@ -137,3 +138,4 @@ public class FragmentPagerSupport extends FragmentActivity {
} }
} }
} }
//END_INCLUDE(complete)

2
samples/Support4Demos/src/com/example/android/supportv4/app/FragmentStatePagerSupport.java
View File

@@ -37,6 +37,7 @@ import android.widget.TextView;
import com.example.android.supportv4.Cheeses; import com.example.android.supportv4.Cheeses;
import com.example.android.supportv4.R; import com.example.android.supportv4.R;
//BEGIN_INCLUDE(complete)
public class FragmentStatePagerSupport extends FragmentActivity { public class FragmentStatePagerSupport extends FragmentActivity {
static final int NUM_ITEMS = 10; static final int NUM_ITEMS = 10;
@@ -138,3 +139,4 @@ public class FragmentStatePagerSupport extends FragmentActivity {
} }
} }
} }
//END_INCLUDE(complete)