From 2cf45dd2242632152d3109130b135f5c9bd2d98b Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Mon, 24 Feb 2020 15:43:29 -0800 Subject: Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL Deprecate TYPE_STATUS_BAR_PANEL. Currently TYPE_STATUS_BAR_ADDITIONAL maps to the same z order as TYPE_NOTIFICATION_SHADE. This will be updated in a subsequent CL. Also move everything in TYPE_STATUS_BAR_PANEL to TYPE_STATUS_BAR_SUB_PANEL so that it remains above the notification shade / keyguard layer. TYPE_STATUS_BAR_PANEL will no longer be valid. As part of the work on having more flexible inset mapping (for Android Automotive) we want to use the TYPE_STATUS_BAR_ADDITIONAL to be used for system bars in different places (i.e. Status Bar on the left side of the screen). Bug: 140423092 Bug: 145242835 Test: boot (sdk_gphone_x86, hawk), existing tests (atest SystemUITests) Change-Id: I0ce3c4152fd05a948c06ed1a96c3ba279bd7097a --- core/java/android/view/ViewRootImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android/view/ViewRootImpl.java') diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4a093e6038b8..28ce1ea8dcd5 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -55,7 +55,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_V import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; -import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL; import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; @@ -2265,7 +2265,7 @@ public final class ViewRootImpl implements ViewParent, } private static boolean shouldUseDisplaySize(final WindowManager.LayoutParams lp) { - return lp.type == TYPE_STATUS_BAR_PANEL + return lp.type == TYPE_STATUS_BAR_ADDITIONAL || lp.type == TYPE_INPUT_METHOD || lp.type == TYPE_VOLUME_OVERLAY; } -- cgit v1.2.3