Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e183971 authored by George Mount's avatar George Mount
Browse files

"Back" with translucent window now sets ActivityOptions. 

Also made convertToTranslucent set the canvas opacity.

Bug 16215650

Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
parent 6906771d

core/java/android/app/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -5410,6 +5410,7 @@ public class Activity extends ContextThemeWrapper 
            mTranslucentCallback = callback;

            mChangeCanvasToTranslucent =

                    ActivityManagerNative.getDefault().convertToTranslucent(mToken, options);

            WindowManagerGlobal.getInstance().changeCanvasOpacity(mToken, false);

            drawComplete = true;

        } catch (RemoteException e) {

            // Make callback return as though it timed out.

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+0 −1
Original line number Diff line number Diff line
@@ -2890,7 +2890,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            invalidate();



            int opacity = PixelFormat.OPAQUE;



            // Note: if there is no background, we will assume opaque. The

            // common case seems to be that an application sets there to be

            // no background so it can draw everything itself. For that,

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -10307,8 +10307,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
                final boolean translucentChanged = r.changeWindowTranslucency(false);

                if (translucentChanged) {

                    r.task.stack.convertToTranslucent(r);

                    mStackSupervisor.ensureActivitiesVisibleLocked(null, 0);

                }

                mStackSupervisor.ensureActivitiesVisibleLocked(null, 0);

                mWindowManager.setAppFullscreen(token, false);

                return translucentChanged;

            }