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

Commit 6b2ad2a1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Only disallow QS expansion while keyboard is visible" into... 

Merge "Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev am: 49a00c31 am: fe1f1421" into udc-dev am: 333bb781

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22462914



Change-Id: I617673b5b4c40397355658f6f3c36d5ccca72882
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33a2e25e 333bb781

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;
@@ -463,9 +465,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() {