diff options
| author | Chet Haase <chet@google.com> | 2013-09-12 19:41:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 19:41:33 +0000 |
| commit | e850c973b0662975137cee8a05f8ee2cb82d9b2a (patch) | |
| tree | 3ba61d6fe9c0b9e4e7fb253a1dc50c27d0a0d920 | |
| parent | 90b10f89d7c1dd217f07f4b51ed8e5c93deccc52 (diff) | |
| parent | abd3d778e591fab03177936e216dce52642eb211 (diff) | |
| download | frameworks_base-e850c973b0662975137cee8a05f8ee2cb82d9b2a.zip frameworks_base-e850c973b0662975137cee8a05f8ee2cb82d9b2a.tar.gz frameworks_base-e850c973b0662975137cee8a05f8ee2cb82d9b2a.tar.bz2 | |
Merge "Hide translucent activity conversion API" into klp-dev
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 45f02e2..1a9b77c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 57686a4..a38fbbf 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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 { /** |