From 66f44bd54d00545d37679666eae4e7327d913d40 Mon Sep 17 00:00:00 2001 From: Arthur Hung Date: Thu, 7 Apr 2022 18:01:08 +0800 Subject: [PATCH] Exclude TYPE_SECURE_SYSTEM_OVERLAY from onehand mode The TYPE_SECURE_SYSTEM_OVERLAY shows secure system overlay window, which need to be displayed on top of everything else. It should not be affected by one hand mode. Bug: 227316706 Test: manual Change-Id: I301a7834f2c6d28860d9cda7af00267bd7e93fd3 --- .../core/java/com/android/server/wm/DisplayAreaPolicy.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/DisplayAreaPolicy.java b/services/core/java/com/android/server/wm/DisplayAreaPolicy.java index 5919806ae7e17..c18377d76cb71 100644 --- a/services/core/java/com/android/server/wm/DisplayAreaPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayAreaPolicy.java @@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE; +import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER; import static android.window.DisplayAreaOrganizer.FEATURE_FULLSCREEN_MAGNIFICATION; @@ -139,7 +140,8 @@ public abstract class DisplayAreaPolicy { .addFeature(new Feature.Builder(wmService.mPolicy, "OneHanded", FEATURE_ONE_HANDED) .all() - .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL) + .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL, + TYPE_SECURE_SYSTEM_OVERLAY) .build()); } rootHierarchy