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

Commit b8678d76 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 210c1a26 to master 

Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
parents c42067d7 210c1a26

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

+9 −1
Original line number Diff line number Diff line
@@ -2285,13 +2285,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                                    "Laying out navigation bar window: (%d,%d - %d,%d)",

                                    pf.left, pf.top, pf.right, pf.bottom));

                    }

                } else if (attrs.type == TYPE_SECURE_SYSTEM_OVERLAY

                } else if ((attrs.type == TYPE_SECURE_SYSTEM_OVERLAY

                                || attrs.type == TYPE_BOOT_PROGRESS)

                        && ((fl & FLAG_FULLSCREEN) != 0)) {

                    // Fullscreen secure system overlays get what they ask for.

                    pf.left = df.left = mUnrestrictedScreenLeft;

                    pf.top = df.top = mUnrestrictedScreenTop;

                    pf.right = df.right = mUnrestrictedScreenLeft+mUnrestrictedScreenWidth;

                    pf.bottom = df.bottom = mUnrestrictedScreenTop+mUnrestrictedScreenHeight;

                } else if (attrs.type == TYPE_BOOT_PROGRESS) {

                    // Boot progress screen always covers entire display.

                    pf.left = df.left = cf.left = mUnrestrictedScreenLeft;

                    pf.top = df.top = cf.top = mUnrestrictedScreenTop;

                    pf.right = df.right = cf.right = mUnrestrictedScreenLeft+mUnrestrictedScreenWidth;

                    pf.bottom = df.bottom = cf.bottom

                            = mUnrestrictedScreenTop+mUnrestrictedScreenHeight;

                } else {

                    pf.left = df.left = cf.left = mRestrictedScreenLeft;

                    pf.top = df.top = cf.top = mRestrictedScreenTop;

services/java/com/android/server/wm/DimAnimator.java

+3 −1
Original line number Diff line number Diff line
@@ -180,7 +180,9 @@ class DimAnimator { 


    public void printTo(String prefix, PrintWriter pw) {

        pw.print(prefix);

        pw.print("mDimSurface="); pw.println(mDimSurface);

        pw.print("mDimSurface="); pw.print(mDimSurface);

                pw.print(" "); pw.print(mLastDimWidth); pw.print(" x ");

                pw.println(mLastDimHeight);

        pw.print(prefix);

        pw.print("mDimShown="); pw.print(mDimShown);

        pw.print(" current="); pw.print(mDimCurrentAlpha);

services/java/com/android/server/wm/WindowManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -8570,6 +8570,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                    if (mDimAnimator == null) {

                        mDimAnimator = new DimAnimator(mFxSession);

                    }

                    if (attrs.type == WindowManager.LayoutParams.TYPE_BOOT_PROGRESS) {

                        mDimAnimator.show(mCurDisplayWidth, mCurDisplayHeight);

                    } else {

                        mDimAnimator.show(innerDw, innerDh);

                    }

                    mDimAnimator.show(innerDw, innerDh);

                    mDimAnimator.updateParameters(mContext.getResources(),

                            w, currentTime);