From 64b1cdcbcfc199a7c7df8363ee8f8670daae13a8 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Wed, 23 Jun 2021 14:02:17 +0000 Subject: [PATCH] Fix caching IME status for split screen even when it is not activated Add back the divider bar view's visibility checks which was removed by ag/14318188 in order to prevent caching IME status while the split is not activated. Fix: 188807172 Test: lock and unlock the device with password keyguard while split activated, observed the split divider handler is visible. Test: rotate the device while showing IME, then dock two apps to enter split mode, observed the split divider handler is visible. Change-Id: Iaa4a68f98bab6a832f4b2cbd448cb42b1ecb9bbb --- .../src/com/android/wm/shell/legacysplitscreen/DividerView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java index 7e4010d5fa6f5..362b40f33e893 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerView.java @@ -408,7 +408,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, } boolean isHidden() { - return mSurfaceHidden; + return getVisibility() != View.VISIBLE || mSurfaceHidden; } /** Starts dragging the divider bar. */