Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1bbc147 authored by Heemin Seog's avatar Heemin Seog Committed by Android (Google) Code Review
Browse files

Merge "Replace TYPE_STATUS_BAR_PANEL with TYPE_STATUS_BAR_ADDITIONAL" into rvc-dev

parents f460a9cd 2cf45dd2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -55730,7 +55730,7 @@ package android.view { 
    field public static final int TYPE_PRIVATE_PRESENTATION = 2030; // 0x7ee

    field public static final int TYPE_SEARCH_BAR = 2001; // 0x7d1

    field public static final int TYPE_STATUS_BAR = 2000; // 0x7d0

    field public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de

    field @Deprecated public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de

    field @Deprecated public static final int TYPE_SYSTEM_ALERT = 2003; // 0x7d3

    field public static final int TYPE_SYSTEM_DIALOG = 2008; // 0x7d8

    field @Deprecated public static final int TYPE_SYSTEM_ERROR = 2010; // 0x7da

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONT 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CONTROLLED;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;

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;
@@ -2276,7 +2276,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;

    }

core/java/android/view/WindowManager.java

+12 −0
Original line number Diff line number Diff line
@@ -1026,7 +1026,11 @@ public interface WindowManager extends ViewManager { 
        /**

         * Window type: panel that slides out from over the status bar

         * In multiuser systems shows on all users' windows.

         *

         * @deprecated This became API by accident and was never intended to be used for

         * applications.

         */

        @Deprecated

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14;



        /**
@@ -1220,6 +1224,14 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40;



        /**

         * Window type: used to show the status bar in non conventional parts of the screen (i.e.

         * the left or the bottom of the screen).

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_STATUS_BAR_ADDITIONAL = FIRST_SYSTEM_WINDOW + 41;



        /**

         * End of types of system windows.

         */

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ public class AuthContainerView extends LinearLayout 
        final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,

                windowFlags,

                PixelFormat.TRANSLUCENT);

        lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ class ChannelEditorDialogController @Inject constructor( 
            window?.apply {

                setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))

                addFlags(wmFlags)

                setType(WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL)

                setType(WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL)

                setWindowAnimations(com.android.internal.R.style.Animation_InputMethod)



                attributes = attributes.apply {