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

Commit 3b0d7645 authored by Brad Stenning's avatar Brad Stenning
Browse files

Moving Notifications into the status bar panel such that the Z layering works as expected 

Bug: 129408503
Test: manual

Change-Id: I321bfe7a56cb027079a7098c99c77aa0649fd9cc
parent 0a0a49be

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:visibility="gone">

    android:fitsSystemWindows="true">



    <LinearLayout

        android:id="@+id/container"

packages/CarSystemUI/res/layout/notification_center_activity.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/notification_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:background="@color/notification_shade_background_color">



    <View

         android:id="@+id/glass_pane"

packages/CarSystemUI/res/layout/super_status_bar.xml

+7 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
        <include layout="@layout/car_top_navigation_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

        />

    </LinearLayout>
@@ -80,6 +79,13 @@ 
        android:layout_height="match_parent"

        android:visibility="invisible"/>



    <include layout="@layout/notification_center_activity"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:layout_marginBottom="112dp"

             android:visibility="invisible"

    />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

packages/CarSystemUI/res/values/config.xml

+9 −26
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <string name="config_systemUIFactoryComponent" translatable="false">

        com.android.systemui.CarSystemUIFactory

    </string>



    <bool name="config_enableFullscreenUserSwitcher">true</bool>



    <!-- configure which system ui bars should be displayed -->
@@ -28,30 +29,12 @@ 
    <bool name="config_enableRightNavigationBar">false</bool>

    <bool name="config_enableBottomNavigationBar">true</bool>



    <!-- SystemUI Services: The classes of the stuff to start. This is duplicated from core

         SystemUi b/c it can't be overlayed at this level for now

    -->

    <string-array name="config_systemUIServiceComponents" translatable="false">

        <item>com.android.systemui.Dependency$DependencyCreator</item>

        <item>com.android.systemui.util.NotificationChannels</item>

        <item>com.android.systemui.notifications.NotificationsUI</item>

        <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>

        <item>com.android.systemui.keyguard.KeyguardViewMediator</item>

        <item>com.android.systemui.recents.Recents</item>

        <item>com.android.systemui.volume.VolumeUI</item>

        <item>com.android.systemui.stackdivider.Divider</item>

        <item>com.android.systemui.SystemBars</item>

        <item>com.android.systemui.usb.StorageNotification</item>

        <item>com.android.systemui.power.PowerUI</item>

        <item>com.android.systemui.media.RingtonePlayer</item>

        <item>com.android.systemui.keyboard.KeyboardUI</item>

        <item>com.android.systemui.pip.PipUI</item>

        <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item>

        <item>@string/config_systemUIVendorServiceComponent</item>

        <item>com.android.systemui.util.leak.GarbageMonitor$Service</item>

        <item>com.android.systemui.LatencyTester</item>

        <item>com.android.systemui.globalactions.GlobalActionsComponent</item>

        <item>com.android.systemui.ScreenDecorations</item>

        <item>com.android.systemui.SliceBroadcastRelayHandler</item>

    </string-array>

    <bool name="config_hideNavWhenKeyguardBouncerShown">true</bool>

    <bool name="config_enablePersistentDockedActivity">false</bool>

    <string name="config_persistentDockedActivityIntentUri" translatable="false"></string>



    <!-- How many icons may be shown at once in the system bar. Includes any

         slots that may be reused for things like IME control. -->

    <integer name="config_maxNotificationIcons">0</integer>



</resources>

packages/CarSystemUI/src/com/android/systemui/notifications/NotificationsUI.java

deleted100644 → 0
+0 −469

File deleted.

Preview size limit exceeded, changes collapsed.