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

Commit 5f3063e3 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Update for new layout flow. 

Now does lock screen and status bar management in the animation pass, to better
match actual changes on screen.

Change-Id: I9a68fcfa1968dfa71961bc164a6fda15b2cd7d47
parent c8830d5c

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

+56 −55
Original line number Diff line number Diff line
@@ -1233,12 +1233,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mDockBottom = mContentBottom = mCurBottom = displayHeight;

        mDockLayer = 0x10000000;



        mTopFullscreenOpaqueWindowState = null;

        mForceStatusBar = false;

        mHideLockScreen = false;

        mAllowLockscreenWhenOn = false;

        mDismissKeyguard = false;

        

        // decide where the status bar goes ahead of time

        if (mStatusBar != null) {

            final Rect pf = mTmpParentFrame;
@@ -1435,6 +1429,43 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        

        win.computeFrameLw(pf, df, cf, vf);

        

        // Dock windows carve out the bottom of the screen, so normal windows

        // can't appear underneath them.

        if (attrs.type == TYPE_INPUT_METHOD && !win.getGivenInsetsPendingLw()) {

            int top = win.getContentFrameLw().top;

            top += win.getGivenContentInsetsLw().top;

            if (mContentBottom > top) {

                mContentBottom = top;

            }

            top = win.getVisibleFrameLw().top;

            top += win.getGivenVisibleInsetsLw().top;

            if (mCurBottom > top) {

                mCurBottom = top;

            }

            if (DEBUG_LAYOUT) Log.v(TAG, "Input method: mDockBottom="

                    + mDockBottom + " mContentBottom="

                    + mContentBottom + " mCurBottom=" + mCurBottom);

        }

    }



    /** {@inheritDoc} */

    public int finishLayoutLw() {

        return 0;

    }



    /** {@inheritDoc} */

    public void beginAnimationLw(int displayWidth, int displayHeight) {

        mTopFullscreenOpaqueWindowState = null;

        mForceStatusBar = false;

        

        mHideLockScreen = false;

        mAllowLockscreenWhenOn = false;

        mDismissKeyguard = false;

    }



    /** {@inheritDoc} */

    public void animatingWindowLw(WindowState win,

                                WindowManager.LayoutParams attrs) {

        if (mTopFullscreenOpaqueWindowState == null &&

                win.isVisibleOrBehindKeyguardLw()) {

            if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
@@ -1449,7 +1480,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    if (localLOGV) Log.v(TAG, "Setting mHideLockScreen to true by win " + win);

                    mHideLockScreen = true;

                }

            }

                if ((attrs.flags & FLAG_DISMISS_KEYGUARD) != 0) {

                    if (localLOGV) Log.v(TAG, "Setting mDismissKeyguard to true by win " + win);

                    mDismissKeyguard = true;
@@ -1458,29 +1488,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mAllowLockscreenWhenOn = true;

                }

            }

        

        // Dock windows carve out the bottom of the screen, so normal windows

        // can't appear underneath them.

        if (attrs.type == TYPE_INPUT_METHOD && !win.getGivenInsetsPendingLw()) {

            int top = win.getContentFrameLw().top;

            top += win.getGivenContentInsetsLw().top;

            if (mContentBottom > top) {

                mContentBottom = top;

            }

            top = win.getVisibleFrameLw().top;

            top += win.getGivenVisibleInsetsLw().top;

            if (mCurBottom > top) {

                mCurBottom = top;

            }

            if (DEBUG_LAYOUT) Log.v(TAG, "Input method: mDockBottom="

                    + mDockBottom + " mContentBottom="

                    + mContentBottom + " mCurBottom=" + mCurBottom);

        }

    }



    /** {@inheritDoc} */

    public int finishLayoutLw() {

    public int finishAnimationLw() {

        int changes = 0;

        

        boolean hiding = false;

        if (mStatusBar != null) {

            if (localLOGV) Log.i(TAG, "force=" + mForceStatusBar
@@ -1506,6 +1520,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            }

        }

        

        if (changes != 0 && hiding) {

            IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));

            if (sbs != null) {

                try {

                    // Make sure the window shade is hidden.

                    sbs.deactivate();

                } catch (RemoteException e) {

                }

            }

        }



        // Hide the key guard if a visible window explicitly specifies that it wants to be displayed

        // when the screen is locked

        if (mKeyguard != null) {
@@ -1540,36 +1566,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        }

        

        if (changes != 0 && hiding) {

            IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));

            if (sbs != null) {

                try {

                    // Make sure the window shade is hidden.

                    sbs.deactivate();

                } catch (RemoteException e) {

                }

            }

        }



        // update since mAllowLockscreenWhenOn might have changed

        updateLockScreenTimeout();

        return changes;

    }



    /** {@inheritDoc} */

    public void beginAnimationLw(int displayWidth, int displayHeight) {

    }



    /** {@inheritDoc} */

    public void animatingWindowLw(WindowState win,

                                WindowManager.LayoutParams attrs) {

    }



    /** {@inheritDoc} */

    public boolean finishAnimationLw() {

        return false;

    }



    public boolean allowAppAnimationsLw() {

        if (mKeyguard != null && mKeyguard.isVisibleLw()) {

            // If keyguard is currently visible, no reason to animate