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

Commit e832194d authored by wilsonshih's avatar wilsonshih Committed by Riddle Hsu
Browse files

Split status bar window (1/N) 

This is the first step to create another new window for status bar.

Small window => TYPE_STATUS_BAR: The bar on top of screen.
Large window => TYPE_NOTIFICATION_SHADE: Anything else.

Bug: 136993073
Test: build then flash
Test: atest WmTests SystemUITests
Test: atest RegisterStatusBarResultTest InsetsFlagsTest

Manual Test:
- Bouncer can show when leave showWhenLocked activity.
- StatusBar can show when comes HUN in fullscreen mode.
- StatusBar can play enter/leave animation in fullscreen mode.
- Able to drag notification panel when bubble/glow existing.
- Switch to market launcher, and run above tests.
- Drag notification panel from launcher several times and observe it
  works fine.

Change-Id: Id9f72cd0e21f01b50d57f02ea60f97c6460926b7
parent 873cbc0e

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4483,7 +4483,7 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40

    field public CharSequence accessibilityTitle;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x400, equals=0x400, name="KEYGUARD"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE_TRANSPARENT"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="ONLY_DRAW_BOTTOM_BAR_BACKGROUND")}) public int privateFlags;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="ONLY_DRAW_BOTTOM_BAR_BACKGROUND")}) public int privateFlags;

  }



}

core/java/android/view/WindowManager.java

+14 −17
Original line number Diff line number Diff line
@@ -1130,6 +1130,15 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 39;



        /**

         * Window type: the notification shade and keyguard. There can be only one status bar

         * window; it is placed at the top of the screen, and all other

         * windows are shifted down so they are below it.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40;



        /**

         * End of types of system windows.

         */
@@ -1731,14 +1740,6 @@ public interface WindowManager extends ViewManager { 
         * {@hide} */

        public static final int PRIVATE_FLAG_SYSTEM_ERROR = 0x00000100;



        /**

         * Flag whether the current window is a keyguard window, meaning that it will hide all other

         * windows behind it except for windows with flag {@link #FLAG_SHOW_WHEN_LOCKED} set.

         * Further, this can only be set by {@link LayoutParams#TYPE_STATUS_BAR}.

         * {@hide}

         */

        public static final int PRIVATE_FLAG_KEYGUARD = 0x00000400;



        /**

         * Flag that prevents the wallpaper behind the current window from receiving touch events.

         *
@@ -1748,12 +1749,12 @@ public interface WindowManager extends ViewManager { 


        /**

         * Flag to force the status bar window to be visible all the time. If the bar is hidden when

         * this flag is set it will be shown again and the bar will have a transparent background.

         * this flag is set it will be shown again.

         * This can only be set by {@link LayoutParams#TYPE_STATUS_BAR}.

         *

         * {@hide}

         */

        public static final int PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT = 0x00001000;

        public static final int PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR = 0x00001000;



        /**

         * Flag indicating that the x, y, width, and height members should be
@@ -1916,18 +1917,14 @@ public interface WindowManager extends ViewManager { 
                        mask = PRIVATE_FLAG_SYSTEM_ERROR,

                        equals = PRIVATE_FLAG_SYSTEM_ERROR,

                        name = "SYSTEM_ERROR"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_KEYGUARD,

                        equals = PRIVATE_FLAG_KEYGUARD,

                        name = "KEYGUARD"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS,

                        equals = PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS,

                        name = "DISABLE_WALLPAPER_TOUCH_EVENTS"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT,

                        equals = PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT,

                        name = "FORCE_STATUS_BAR_VISIBLE_TRANSPARENT"),

                        mask = PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR,

                        equals = PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR,

                        name = "FORCE_STATUS_BAR_VISIBLE"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_PRESERVE_GEOMETRY,

                        equals = PRIVATE_FLAG_PRESERVE_GEOMETRY,

packages/CarSystemUI/res/layout/super_notification_shade.xml

0 → 100644
+111 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2020, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- This is the notification shade window. -->

<com.android.systemui.statusbar.phone.NotificationShadeWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <com.android.systemui.statusbar.BackDropView

        android:id="@+id/backdrop"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        sysui:ignoreRightInset="true"

    >

        <ImageView android:id="@+id/backdrop_back"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"/>

        <ImageView android:id="@+id/backdrop_front"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"

            android:visibility="invisible"/>

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_for_bubble"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height"

        android:orientation="vertical"

    >

        <FrameLayout

            android:id="@+id/status_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

        />



        <FrameLayout

            android:id="@+id/car_top_navigation_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </LinearLayout>



    <include layout="@layout/brightness_mirror"/>



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout="@layout/car_fullscreen_user_switcher"/>



    <include layout="@layout/notification_center_activity"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginBottom="@dimen/navigation_bar_height"

        android:visibility="invisible"/>



    <include layout="@layout/headsup_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



</com.android.systemui.statusbar.phone.NotificationShadeWindowView>

packages/CarSystemUI/res/layout/super_status_bar.xml

+21 −97
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

**

** Copyright 2020, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- This is the combined status bar / notification panel window. -->

<!-- This is the status bar window. -->

<com.android.systemui.statusbar.phone.StatusBarWindowView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"
@@ -23,87 +25,9 @@ 
    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <com.android.systemui.statusbar.BackDropView

        android:id="@+id/backdrop"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        sysui:ignoreRightInset="true"

    >

        <ImageView android:id="@+id/backdrop_back"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"/>

        <ImageView android:id="@+id/backdrop_front"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"

            android:visibility="invisible"/>

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_for_bubble"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height"

        android:orientation="vertical"

    >

    <FrameLayout

        android:id="@+id/status_bar_container"

        android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

        />



        <FrameLayout

            android:id="@+id/car_top_navigation_bar_container"

            android:layout_width="match_parent"

        android:layout_height="wrap_content" />

    </LinearLayout>



    <include layout="@layout/brightness_mirror"/>



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout="@layout/car_fullscreen_user_switcher"/>



    <include layout="@layout/notification_center_activity"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginBottom="@dimen/navigation_bar_height"

        android:visibility="invisible"/>



    <include layout="@layout/headsup_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />



</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 


    private void buildNavBarWindows() {

        mTopNavigationBarWindow = mSuperStatusBarViewFactory

                .getStatusBarWindowView()

                .getNotificationShadeWindowView()

                .findViewById(R.id.car_top_navigation_bar_container);

        mBottomNavigationBarWindow = mCarNavigationBarController.getBottomWindow();

        mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow();