From a1d572cf9dd921038a9549eaf7ddb93262487f25 Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Mon, 20 Apr 2020 09:38:50 -0700 Subject: [PATCH] Move windowing layers appropriately This wasn't previously possible due to conflicts with phone views. Now that the phone views are removed, we should be able to use the appropriate windowing layers. Bug: 153732333 Test: manual Change-Id: I23cf16324eff6b4883ab93afe7e35e6d5a9b97d3 --- .../android/systemui/car/userswitcher/UserGridRecyclerView.java | 2 +- .../systemui/window/SystemUIOverlayWindowController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java index 58add179886cc..2ff667093e580 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java @@ -368,7 +368,7 @@ public class UserGridRecyclerView extends RecyclerView { private void applyCarSysUIDialogFlags(AlertDialog dialog) { final Window window = dialog.getWindow(); - window.setType(WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL); + window.setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); window.getAttributes().setFitInsetsTypes( diff --git a/packages/CarSystemUI/src/com/android/systemui/window/SystemUIOverlayWindowController.java b/packages/CarSystemUI/src/com/android/systemui/window/SystemUIOverlayWindowController.java index 0dbe1a3ea1dd3..04d69eabaeac6 100644 --- a/packages/CarSystemUI/src/com/android/systemui/window/SystemUIOverlayWindowController.java +++ b/packages/CarSystemUI/src/com/android/systemui/window/SystemUIOverlayWindowController.java @@ -90,7 +90,7 @@ public class SystemUIOverlayWindowController implements mLp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL, + WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH