提交: e5062a33a9714a1cd81efaef3924cac2687ee4f8 - development (git)

development

Commit MetaInfo

• 修订版: e5062a33a9714a1cd81efaef3924cac2687ee4f8 (tree)
• 时间: 2011-06-17 06:52:21
• 作者: Dianne Hackborn <hackbod@goog...>
• Commiter: Android Git Automerger

Log Message

am 102041a8: SDK only: add documentation tags.

* commit '102041a8bc4ebca69c20f5d281a96a904c52d4c8':

SDK only: add documentation tags.

更改概述

• modified: samples/ApiDemos/src/com/example/android/apis/app/FragmentTabs.java
• modified: samples/Support13Demos/_index.html
• modified: samples/Support4Demos/_index.html
• modified: samples/Support4Demos/res/layout/fragment_tabs.xml
• modified: samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java

差异

--- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentTabs.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentTabs.java
@@ -17,6 +17,7 @@ package com.example.android.apis.app;
 
 import com.example.android.apis.R;
 
+//BEGIN_INCLUDE(complete)
 import android.app.ActionBar;
 import android.app.ActionBar.Tab;
 import android.app.Activity;
@@ -114,3 +115,4 @@ public class FragmentTabs extends Activity {
         }
     }
 }
+//END_INCLUDE(complete)

--- a/samples/Support13Demos/_index.html
+++ b/samples/Support13Demos/_index.html
@@ -1,8 +1,8 @@
-<p>The Support v4 Demos application contains a variety of small sample
-code showing how to use key features of the support library.
+<p>The Support v13 Demos application contains a variety of small sample
+code showing how to use key features of the Android API 13+ Support Library.
 This library contains code that you can
 build in to your application to access new features and common
-utilities while being able to run down to version 1.6 (API 4)
+utilities while being able to run down to version 3.2 (API 13)
 of the platform.
 </p>
 

--- a/samples/Support4Demos/_index.html
+++ b/samples/Support4Demos/_index.html
@@ -1,5 +1,5 @@
 <p>The Support v4 Demos application contains a variety of small sample
-code showing how to use key features of the support library.
+code showing how to use key features of the Android API 4+ Support Library.
 This library contains code that you can
 build in to your application to access new features and common
 utilities while being able to run down to version 1.6 (API 4)

--- a/samples/Support4Demos/res/layout/fragment_tabs.xml
+++ b/samples/Support4Demos/res/layout/fragment_tabs.xml
@@ -18,6 +18,7 @@
 */
 -->
 
+<!-- BEGIN_INCLUDE(complete) -->
 <TabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/tabhost"
@@ -50,3 +51,4 @@
 
     </LinearLayout>
 </TabHost>
+<!-- END_INCLUDE(complete) -->

--- a/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/app/FragmentTabs.java
@@ -15,6 +15,7 @@
  */
 package com.example.android.supportv4.app;
 
+//BEGIN_INCLUDE(complete)
 import java.util.HashMap;
 
 import com.example.android.supportv4.R;
@@ -167,3 +168,4 @@ public class FragmentTabs extends FragmentActivity {
         }
     }
 }
+//END_INCLUDE(complete)