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

Commit 1f1bb5f1 authored by Youngjun Kwak's avatar Youngjun Kwak Committed by Automerger Merge Worker
Browse files

Merge "Make Keyguard window focusable so that adb shell input command... 

Merge "Make Keyguard window focusable so that adb shell input command registers" into rvc-dev am: a5894a79

Change-Id: Id2928c88cb91c8125ada44eaa9ee3c29c25c0d5c
parents 853c44b9 a5894a79

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

+5 −2
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public class CarKeyguardViewController extends OverlayViewController implements 
        mKeyguardStateController.notifyKeyguardState(mShowing, /* occluded= */ false);

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

        start();

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

        reset(/* hideBouncerWhenShowing= */ false);

        notifyKeyguardUpdateMonitor();

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

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

        stop();

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

        mKeyguardStateController.notifyKeyguardDoneFading();

        mViewMediatorCallback.keyguardGone();

        notifyKeyguardUpdateMonitor();
@@ -229,8 +231,10 @@ public class CarKeyguardViewController extends OverlayViewController implements 


    @Override

    public void dismissAndCollapse() {

        if (!mBouncer.isSecure()) {

            hide(/* startTime= */ 0, /* fadeoutDuration= */ 0);

        }

    }



    @Override

    public void startPreHideAnimation(Runnable finishRunnable) {
@@ -241,7 +245,6 @@ public class CarKeyguardViewController extends OverlayViewController implements 


    @Override

    public void setNeedsInput(boolean needsInput) {

        getOverlayViewGlobalStateController().setWindowFocusable(needsInput);

        getOverlayViewGlobalStateController().setWindowNeedsInput(needsInput);

    }