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

Commit ff42dc6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Separate Notification Panel" into rvc-dev am: 47e2a13c am: 10b2a34a am: 2c90b5bd 

Change-Id: Ic070c9b68eada5c54a51cf052afad589858d8640
parents 22eede1e 2c90b5bd

packages/CarSystemUI/res/layout/notification_center_activity.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    android:id="@+id/notification_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="invisible"

    android:layout_marginBottom="@dimen/navigation_bar_height"

    android:background="@color/notification_shade_background_color">



    <View

packages/CarSystemUI/res/layout/notification_panel_container.xml

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

<!--

  ~ Copyright (C) 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.

  -->

<FrameLayout

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

    android:id="@+id/notification_container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"/>

packages/CarSystemUI/res/layout/sysui_overlay_window.xml

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



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

              android:layout_width="match_parent"

              android:layout_height="match_parent"

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



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

              android:layout_width="match_parent"

              android:layout_height="match_parent"

packages/CarSystemUI/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
    <!-- Car System UI's OverlayViewsMediator-->

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

        <item>com.android.systemui.car.userswitcher.FullscreenUserSwitcherViewMediator</item>

        <item>com.android.systemui.car.notification.NotificationPanelViewMediator</item>

    </string-array>



    <!-- SystemUI Services: The classes of the stuff to start. -->

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.stackdivider.DividerModule; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.car.CarShadeControllerImpl;

import com.android.systemui.statusbar.car.CarStatusBar;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;
@@ -47,6 +46,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;

import com.android.systemui.statusbar.phone.NotificationGroupManager;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.ShadeControllerImpl;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -120,7 +120,7 @@ abstract class CarSystemUIModule { 
            KeyguardEnvironmentImpl keyguardEnvironment);



    @Binds

    abstract ShadeController provideShadeController(CarShadeControllerImpl shadeController);

    abstract ShadeController provideShadeController(ShadeControllerImpl shadeController);



    @Provides

    @Singleton