am a49ab110: Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev

* commit 'a49ab11049339155c156e0f58bb076396695be75': Make convertToTranslucent a public method in Activity
2014-06-11 17:02:13 +00:00
parent d038666f3c 583b6f782c
commit acdee87366
1 changed files with 2 additions and 1 deletions
--- 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;