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

Commit efff36c3 authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "Adjust window focusable by view controller"

parents 19507c59 91d05ae6

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java

+3 −2
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged 
        }

    }



    class PerDisplay extends IDisplayWindowInsetsController.Stub {

    /** An implementation of {@link IDisplayWindowInsetsController} for a given display id. */

    public class PerDisplay extends IDisplayWindowInsetsController.Stub {

        final int mDisplayId;

        final InsetsState mInsetsState = new InsetsState();

        InsetsSourceControl mImeSourceControl = null;
@@ -189,7 +190,7 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged 
        final Rect mImeFrame = new Rect();

        boolean mAnimateAlpha = true;



        PerDisplay(int displayId, int initialRotation) {

        public PerDisplay(int displayId, int initialRotation) {

            mDisplayId = displayId;

            mRotation = initialRotation;

        }

packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java

+1 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class CarKeyguardViewController extends OverlayViewController implements 
    }



    @Override

    protected boolean shouldShowNavigationBar() {

    protected boolean shouldShowNavigationBarInsets() {

        return true;

    }
@@ -157,7 +157,6 @@ public class CarKeyguardViewController extends OverlayViewController implements 
        mKeyguardStateController.notifyKeyguardState(mShowing, /* occluded= */ false);

        mCarNavigationBarController.showAllKeyguardButtons(/* isSetUp= */ true);

        start();

        getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ true);

        reset(/* hideBouncerWhenShowing= */ false);

        notifyKeyguardUpdateMonitor();

    }
@@ -172,7 +171,6 @@ public class CarKeyguardViewController extends OverlayViewController implements 
        mBouncer.hide(/* destroyView= */ true);

        mCarNavigationBarController.hideAllKeyguardButtons(/* isSetUp= */ true);

        stop();

        getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);

        mKeyguardStateController.notifyKeyguardDoneFading();

        mHandler.post(mViewMediatorCallback::keyguardGone);

        notifyKeyguardUpdateMonitor();
@@ -217,7 +215,6 @@ public class CarKeyguardViewController extends OverlayViewController implements 
    public void onCancelClicked() {

        if (mBouncer == null) return;



        getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);

        getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);



        mBouncer.hide(/* destroyView= */ true);

packages/CarSystemUI/src/com/android/systemui/car/notification/NotificationPanelViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -193,12 +193,12 @@ public class NotificationPanelViewController extends OverlayPanelViewController 
    }



    @Override

    protected boolean shouldShowNavigationBar() {

    protected boolean shouldShowNavigationBarInsets() {

        return true;

    }



    @Override

    protected boolean shouldShowStatusBar() {

    protected boolean shouldShowStatusBarInsets() {

        return true;

    }

packages/CarSystemUI/src/com/android/systemui/car/userswitcher/FullScreenUserSwitcherViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ public class FullScreenUserSwitcherViewController extends OverlayViewController 
        registerCarUserManagerIfPossible();

    }



    @Override

    protected boolean shouldFocusWindow() {

        return false;

    }



    @Override

    protected void showInternal() {

        getLayout().setVisibility(View.VISIBLE);

packages/CarSystemUI/src/com/android/systemui/car/window/OverlayPanelViewController.java

+0 −2
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ public abstract class OverlayPanelViewController extends OverlayViewController { 
        }



        onAnimateCollapsePanel();

        getOverlayViewGlobalStateController().setWindowFocusable(false);

        animatePanel(mClosingVelocity, /* isClosing= */ true);

    }
@@ -415,7 +414,6 @@ public abstract class OverlayPanelViewController extends OverlayViewController { 
            getOverlayViewGlobalStateController().hideView(/* panelViewController= */ this);

        }

        getLayout().setVisibility(visible ? View.VISIBLE : View.INVISIBLE);

        getOverlayViewGlobalStateController().setWindowFocusable(visible);

    }



    /* ***************************************************************************************** *