Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f04883f authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

SDK only: integrate new sample code, deprecating along the way. 

The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
parent abd4dffc

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -392,6 +392,10 @@ web_docs_sample_code_flags := \ 
		            resources/samples/AccelerometerPlay "Accelerometer Play" \

		-samplecode $(sample_dir)/ApiDemos \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/Support4Demos \

		            resources/samples/Support4Demos "API 4+ Support Demos" \

		-samplecode $(sample_dir)/Support13Demos \

		            resources/samples/Support13Demos "API 13+ Support Demos" \

		-samplecode $(sample_dir)/BackupRestore \

		            resources/samples/BackupRestore "Backup and Restore" \

		-samplecode $(sample_dir)/BluetoothChat \

api/current.xml

+3 −3
Original line number Diff line number Diff line
@@ -25290,7 +25290,7 @@ 
 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<constructor name="ActivityGroup"
@@ -33946,7 +33946,7 @@ 
 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<constructor name="LocalActivityManager"
@@ -37020,7 +37020,7 @@ 
 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<constructor name="TabActivity"

core/java/android/app/ActionBar.java

+6 −0
Original line number Diff line number Diff line
@@ -400,6 +400,12 @@ public abstract class ActionBar { 
     * Create and return a new {@link Tab}.

     * This tab will not be included in the action bar until it is added.

     *

     * <p>Very often tabs will be used to switch between {@link Fragment}

     * objects.  Here is a typical implementation of such tabs:</p>

     *

     * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/FragmentTabs.java

     *      complete}

     *

     * @return A new Tab

     *

     * @see #addTab(Tab)

core/java/android/app/ActivityGroup.java

+5 −0
Original line number Diff line number Diff line
@@ -23,8 +23,13 @@ import android.os.Bundle; 
import android.util.Log;



/**

 * @deprecated Use the new {@link Fragment} and {@link FragmentManager} APIs

 * instead; these are also

 * available on older platforms through the Android compatibility package.

 *

 * A screen that contains and runs multiple embedded activities.

 */

@Deprecated

public class ActivityGroup extends Activity {

    private static final String TAG = "ActivityGroup";

    private static final String STATES_KEY = "android:states";

core/java/android/app/LocalActivityManager.java

+6 −1
Original line number Diff line number Diff line
@@ -28,12 +28,17 @@ import java.util.HashMap; 
import java.util.Map;



/**

 * Helper class for managing multiple running embedded activities in the same

 * @deprecated Use the new {@link Fragment} and {@link FragmentManager} APIs

 * instead; these are also

 * available on older platforms through the Android compatibility package.

 *

 * <p>Helper class for managing multiple running embedded activities in the same

 * process. This class is not normally used directly, but rather created for

 * you as part of the {@link android.app.ActivityGroup} implementation.

 *

 * @see ActivityGroup

 */

@Deprecated

public class LocalActivityManager {

    private static final String TAG = "LocalActivityManager";

    private static final boolean localLOGV = false;