resolved conflicts for merge of 872a1e79 to master (a7f88508) · Commits · e / os / android_frameworks_base

Android.mk

+5 −1

Original line number	Diff line number	Diff line
		@@ -384,6 +384,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 \

+3 −3

Original line number	Diff line number	Diff line
		@@ -2448,7 +2448,7 @@ package android.app {
		field public static final int RESULT_OK = -1; // 0xffffffff
		}

		public class ActivityGroup extends android.app.Activity {
		public deprecated class ActivityGroup extends android.app.Activity {
		ctor public ActivityGroup();
		ctor public ActivityGroup(boolean);
		method public android.app.Activity getCurrentActivity();
		@@ -3237,7 +3237,7 @@ package android.app {
		method public abstract void onLoaderReset(android.content.Loader<D>);
		}

		public class LocalActivityManager {
		public deprecated class LocalActivityManager {
		ctor public LocalActivityManager(android.app.Activity, boolean);
		method public android.view.Window destroyActivity(java.lang.String, boolean);
		method public void dispatchCreate(android.os.Bundle);
		@@ -3520,7 +3520,7 @@ package android.app {
		field public static final int START_STICKY_COMPATIBILITY = 0; // 0x0
		}

		public class TabActivity extends android.app.ActivityGroup {
		public deprecated class TabActivity extends android.app.ActivityGroup {
		ctor public TabActivity();
		method public android.widget.TabHost getTabHost();
		method public android.widget.TabWidget getTabWidget();

+6 −0

Original line number	Diff line number	Diff line
		@@ -487,6 +487,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)

+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";

+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;