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

Commit 647900ea authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Generalize notifications logic into a subclass of... 

Merge "Generalize notifications logic into a subclass of OverlayViewController" into rvc-dev am: d307dceb

Change-Id: I424c41e7c8be5b0265f266543aa20350335bfb10
parents 12e7da60 d307dceb

packages/CarSystemUI/res/layout/notification_center_activity.xml

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

    android:id="@+id/notification_view"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:visibility="invisible"

    android:layout_marginBottom="@dimen/navigation_bar_height"

    android:background="@color/notification_shade_background_color">

    android:background="@color/notification_shade_background_color">





    <View

    <View

packages/CarSystemUI/res/layout/notification_panel_container.xml

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

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

    android:id="@+id/notification_container"

    android:id="@+id/notification_container"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"/>
 
    android:layout_height="match_parent"

    android:visibility="invisible"/>

packages/CarSystemUI/res/layout/sysui_overlay_window.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -22,10 +22,12 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent">





    <!-- TODO(b/151617493): replace marginBottom with insets. -->

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

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

              android:layout_width="match_parent"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:layout_height="match_parent"

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

              android:layout="@layout/notification_panel_container"

              android:layout_marginBottom="@dimen/navigation_bar_height"/>





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

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

              android:layout_width="match_parent"

              android:layout_width="match_parent"

packages/CarSystemUI/src/com/android/systemui/car/CarDeviceProvisionedController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController; 
 */

 */

public interface CarDeviceProvisionedController extends DeviceProvisionedController {

public interface CarDeviceProvisionedController extends DeviceProvisionedController {

    /**

    /**

     * Returns {@code true} then SUW is in progress for the given user.

     * Returns {@code true} when SUW is in progress for the given user.

     */

     */

    boolean isUserSetupInProgress(int user);

    boolean isUserSetupInProgress(int user);

packages/CarSystemUI/src/com/android/systemui/car/notification/NotificationPanelViewController.java

+101 −443

File changed.

Preview size limit exceeded, changes collapsed.