Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev am: 49a00c3195 am: fe1f1421fc

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

Change-Id: I3630d1e7a305a8f5ad333b4eede6fff6576e9a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2023-04-07 22:38:06 +00:00
committed by Automerger Merge Worker
parent 756ee44b44 fe1f1421fc
commit 77a156a89c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java
View File

@@ -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() {