diff options
| author | 2023-04-07 22:38:06 +0000 | |
|---|---|---|
| committer | 2023-04-07 22:38:06 +0000 | |
| commit | 77a156a89c2a4a2859d3f95bc38d5ff63091960c (patch) | |
| tree | a4d93c3e17502452e99851f3dfd8559dff6164e0 | |
| parent | 756ee44b44980494aec74f8dbd33ce688b4cc8a8 (diff) | |
| parent | fe1f1421fc8bca74062dc58722e0901e15e5c48b (diff) | |
Merge "Only disallow QS expansion while keyboard is visible" into tm-qpr-dev am: 49a00c3195 am: fe1f1421fc
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>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java index b31ec3319781..7cb1cbe77539 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java @@ -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() { |