summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJose Lima <joselima@google.com>2014-06-10 21:25:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-10 21:25:11 +0000
commit583b6f782c2e989bd6d62838a3f1c69104335fdd (patch)
treeb710604e3928ee6c537c9166821c37b0acb86ece /core/java
parent6ab89e28cdcddad524ad6ce6036c2a2743db7d23 (diff)
parent5517ea78eb3c6fb3e9dfe3d9457533188d1f0294 (diff)
downloadframeworks_base-583b6f782c2e989bd6d62838a3f1c69104335fdd.zip
frameworks_base-583b6f782c2e989bd6d62838a3f1c69104335fdd.tar.gz
frameworks_base-583b6f782c2e989bd6d62838a3f1c69104335fdd.tar.bz2
Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/Activity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 23b5f29..946555f 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5326,7 +5326,8 @@ public class Activity extends ContextThemeWrapper
*
* @hide
*/
- void convertToTranslucent(TranslucentConversionListener callback, ActivityOptions options) {
+ public void convertToTranslucent(TranslucentConversionListener callback,
+ ActivityOptions options) {
boolean drawComplete;
try {
mTranslucentCallback = callback;