Merge "Hide translucent activity conversion API" into klp-dev (e850c973) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -2725,8 +2725,6 @@ package android.app {
		method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
		method public void closeContextMenu();
		method public void closeOptionsMenu();
		method public void convertFromTranslucent();
		method public void convertToTranslucent(android.app.Activity.TranslucentConversionListener);
		method public android.app.PendingIntent createPendingResult(int, android.content.Intent, int);
		method public final deprecated void dismissDialog(int);
		method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);
		@@ -2912,10 +2910,6 @@ package android.app {
		field public static final int RESULT_OK = -1; // 0xffffffff
		}

		public static abstract interface Activity.TranslucentConversionListener {
		method public abstract void onTranslucentConversionComplete(boolean);
		}

		public deprecated class ActivityGroup extends android.app.Activity {
		ctor public ActivityGroup();
		ctor public ActivityGroup(boolean);

+6 −0

Original line number	Diff line number	Diff line
		@@ -4907,6 +4907,8 @@ public class Activity extends ContextThemeWrapper
		*
		* @see #convertToTranslucent(TranslucentConversionListener)
		* @see TranslucentConversionListener
		*
		* @hide
		*/
		public void convertFromTranslucent() {
		try {
		@@ -4937,6 +4939,8 @@ public class Activity extends ContextThemeWrapper
		*
		* @see #convertFromTranslucent()
		* @see TranslucentConversionListener
		*
		* @hide
		*/
		public void convertToTranslucent(TranslucentConversionListener callback) {
		try {
		@@ -5441,6 +5445,8 @@ public class Activity extends ContextThemeWrapper
		* opaque using {@link Activity#convertFromTranslucent()} and before it has been drawn
		* translucent again following a call to {@link
		* Activity#convertToTranslucent(TranslucentConversionListener)}.
		*
		* @hide
		*/
		public interface TranslucentConversionListener {
		/**