Merge "SDK only: add markup for use in documentation." into ics-mr1
This commit is contained in:
committed by
Android (Google) Code Review
commit
170b26ba32
@@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Top-level content view for the simple fragment sample. -->
|
||||
|
||||
<!-- BEGIN_INCLUDE(complete) -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:padding="4dip"
|
||||
android:gravity="center_horizontal"
|
||||
@@ -42,3 +43,4 @@
|
||||
</Button>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<!-- END_INCLUDE(complete) -->
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- BEGIN_INCLUDE(complete) -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
@@ -50,3 +51,4 @@
|
||||
</FrameLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<!-- END_INCLUDE(complete) -->
|
||||
|
||||
@@ -33,6 +33,7 @@ import android.support.v4.view.ViewPager;
|
||||
* This demonstrates the use of action bar tabs and how they interact
|
||||
* with other action bar features.
|
||||
*/
|
||||
//BEGIN_INCLUDE(complete)
|
||||
public class ActionBarTabsPager extends Activity {
|
||||
ViewPager mViewPager;
|
||||
TabsAdapter mTabsAdapter;
|
||||
@@ -157,3 +158,4 @@ public class ActionBarTabsPager extends Activity {
|
||||
}
|
||||
}
|
||||
}
|
||||
//END_INCLUDE(complete)
|
||||
|
||||
@@ -37,6 +37,7 @@ import android.widget.Button;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
|
||||
//BEGIN_INCLUDE(complete)
|
||||
public class FragmentPagerSupport extends Activity {
|
||||
static final int NUM_ITEMS = 10;
|
||||
|
||||
@@ -138,3 +139,4 @@ public class FragmentPagerSupport extends Activity {
|
||||
}
|
||||
}
|
||||
}
|
||||
//END_INCLUDE(complete)
|
||||
|
||||
@@ -37,6 +37,7 @@ import android.widget.Button;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
|
||||
//BEGIN_INCLUDE(complete)
|
||||
public class FragmentStatePagerSupport extends Activity {
|
||||
static final int NUM_ITEMS = 10;
|
||||
|
||||
@@ -138,3 +139,4 @@ public class FragmentStatePagerSupport extends Activity {
|
||||
}
|
||||
}
|
||||
}
|
||||
//END_INCLUDE(complete)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Top-level content view for the simple fragment sample. -->
|
||||
|
||||
<!-- BEGIN_INCLUDE(complete) -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical" android:padding="4dip"
|
||||
android:gravity="center_horizontal"
|
||||
@@ -42,3 +43,4 @@
|
||||
</Button>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<!-- END_INCLUDE(complete) -->
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- BEGIN_INCLUDE(complete) -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
@@ -50,3 +51,4 @@
|
||||
</FrameLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<!-- END_INCLUDE(complete) -->
|
||||
|
||||
@@ -36,6 +36,7 @@ import android.widget.Button;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
|
||||
//BEGIN_INCLUDE(complete)
|
||||
public class FragmentPagerSupport extends FragmentActivity {
|
||||
static final int NUM_ITEMS = 10;
|
||||
|
||||
@@ -137,3 +138,4 @@ public class FragmentPagerSupport extends FragmentActivity {
|
||||
}
|
||||
}
|
||||
}
|
||||
//END_INCLUDE(complete)
|
||||
|
||||
@@ -37,6 +37,7 @@ import android.widget.TextView;
|
||||
import com.example.android.supportv4.Cheeses;
|
||||
import com.example.android.supportv4.R;
|
||||
|
||||
//BEGIN_INCLUDE(complete)
|
||||
public class FragmentStatePagerSupport extends FragmentActivity {
|
||||
static final int NUM_ITEMS = 10;
|
||||
|
||||
@@ -138,3 +139,4 @@ public class FragmentStatePagerSupport extends FragmentActivity {
|
||||
}
|
||||
}
|
||||
}
|
||||
//END_INCLUDE(complete)
|
||||
|
||||
Reference in New Issue
Block a user