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

Commit afc965ea authored by Vadim Tryshev's avatar Vadim Tryshev Committed by android-build-merger
Browse files

Merge "Adding a setting to force user activity." into nyc-dev 

am: 23f3745e

* commit '23f3745e':
  Adding a setting to force user activity.
parents a070a895 23f3745e

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback { 
    private void applyInputFeatures(State state) {

    private void applyInputFeatures(State state) {

        if (state.isKeyguardShowingAndNotOccluded()

        if (state.isKeyguardShowingAndNotOccluded()

                && state.statusBarState == StatusBarState.KEYGUARD

                && state.statusBarState == StatusBarState.KEYGUARD

                && !state.qsExpanded) {

                && !state.qsExpanded && !state.forceUserActivity) {

            mLpChanged.inputFeatures |=

            mLpChanged.inputFeatures |=

                    WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY;

                    WindowManager.LayoutParams.INPUT_FEATURE_DISABLE_USER_ACTIVITY;

        } else {

        } else {
@@ -265,6 +265,11 @@ public class StatusBarWindowManager implements RemoteInputController.Callback { 
        apply(mCurrentState);

        apply(mCurrentState);

    }

    }





    public void setForceUserActivity(boolean forceUserActivity) {

        mCurrentState.forceUserActivity = forceUserActivity;

        apply(mCurrentState);

    }



    public void setHeadsUpShowing(boolean showing) {

    public void setHeadsUpShowing(boolean showing) {

        mCurrentState.headsUpShowing = showing;

        mCurrentState.headsUpShowing = showing;

        apply(mCurrentState);

        apply(mCurrentState);
@@ -332,6 +337,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback { 
        boolean forceStatusBarVisible;

        boolean forceStatusBarVisible;

        boolean forceCollapsed;

        boolean forceCollapsed;

        boolean forceDozeBrightness;

        boolean forceDozeBrightness;

        boolean forceUserActivity;





        /**

        /**

         * The {@link BaseStatusBar} state from the status bar.

         * The {@link BaseStatusBar} state from the status bar.