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

Commit 7ceae6d5 authored by Justin Weir's avatar Justin Weir
Browse files

Only disallow QS expansion while keyboard is visible 

Currently, a bug makes isRemoteInput sometimes returns true when
there is no remote input. In order to reduce the impact of the
bug, we will also require the keyboard to be visible to block QS
expansion. This will allow users to dismiss the keyboard then
expand QS while the input has the focus, but this is an
acceptable tradeoff while the root cause is being addressed.

Bug: 276357074
Test: manually checked go/shade-cujs and ran atest
Change-Id: I291ea25c45297820032dec10d81fe88e4159bea6
parent 31fb807e

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+11 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


package com.android.systemui.shade;



import static android.view.WindowInsets.Type.ime;



import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE;

import static com.android.systemui.classifier.Classifier.QS_COLLAPSE;

import static com.android.systemui.shade.NotificationPanelViewController.COUNTER_PANEL_OPEN_QS;
@@ -450,9 +452,17 @@ public class QuickSettingsController { 
        return (mQs != null ? mQs.getHeader().getHeight() : 0) + mPeekHeight;

    }



    private boolean isRemoteInputActiveWithKeyboardUp() {

        //TODO(b/227115380) remove the isVisible(ime()) check once isRemoteInputActive is fixed.

        // The check for keyboard visibility is a temporary workaround that allows QS to expand

        // even when isRemoteInputActive is mistakenly returning true.

        return mRemoteInputManager.isRemoteInputActive()

                && mPanelView.getRootWindowInsets().isVisible(ime());

    }



    public boolean isExpansionEnabled() {

        return mExpansionEnabledPolicy && mExpansionEnabledAmbient

                && !mRemoteInputManager.isRemoteInputActive();

            && !isRemoteInputActiveWithKeyboardUp();

    }



    public float getTransitioningToFullShadeProgress() {