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

Commit c394db80 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Fix a few issues with occluded Keyguard 

am: c5804afa

* commit 'c5804afa':
  Fix a few issues with occluded Keyguard

Change-Id: I0e805ee2b7cf37b60b08f951bf1e0e4fdde93464
parents c8cd9483 c5804afa

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -883,6 +883,10 @@ public abstract class PanelView extends FrameLayout { 
                new ViewTreeObserver.OnGlobalLayoutListener() {

                new ViewTreeObserver.OnGlobalLayoutListener() {

                    @Override

                    @Override

                    public void onGlobalLayout() {

                    public void onGlobalLayout() {

                        if (!mInstantExpanding) {

                            getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            return;

                        }

                        if (mStatusBar.getStatusBarWindow().getHeight()

                        if (mStatusBar.getStatusBarWindow().getHeight()

                                != mStatusBar.getStatusBarHeight()) {

                                != mStatusBar.getStatusBarHeight()) {

                            getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            getViewTreeObserver().removeOnGlobalLayoutListener(this);
@@ -907,6 +911,10 @@ public abstract class PanelView extends FrameLayout { 
        if (mExpanding) {

        if (mExpanding) {

            notifyExpandingFinished();

            notifyExpandingFinished();

        }

        }

        if (mInstantExpanding) {

            mInstantExpanding = false;

            notifyBarPanelExpansionChanged();

        }

    }

    }





    private void abortAnimations() {

    private void abortAnimations() {

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -4409,7 +4409,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (wtoken.hidden || wtoken.mAppStopped) {

                if (wtoken.hidden || wtoken.mAppStopped) {

                    wtoken.allDrawn = false;

                    wtoken.allDrawn = false;

                    wtoken.deferClearAllDrawn = false;

                    wtoken.deferClearAllDrawn = false;



                    // If the app was already visible, don't reset the waitingToShow state.

                    if (wtoken.hidden) {

                        wtoken.waitingToShow = true;

                        wtoken.waitingToShow = true;

                    }





                    if (wtoken.clientHidden) {

                    if (wtoken.clientHidden) {

                        // In the case where we are making an app visible

                        // In the case where we are making an app visible