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

Commit e20bb001 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am e302d4dc: Merge "Make notification panel fullscreen on tablets." 

* commit 'e302d4dc3d61f4aefdf8e5f32c2887b87089582e':
  Make notification panel fullscreen on tablets.
parents 5114a686 38508055

packages/SystemUI/res/layout/status_bar_expanded.xml

+2 −9
Original line number Diff line number Diff line
@@ -50,9 +50,8 @@ 
        />



    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

        style="@style/NotificationsQuickSettings"

        android:id="@+id/notification_container_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipToPadding="false"

        android:clipChildren="false">
@@ -89,13 +88,7 @@ 


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





    <include layout="@layout/status_bar_expanded_header"

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_header_height"

        android:layout_marginLeft="@dimen/notification_side_padding"

        android:layout_marginRight="@dimen/notification_side_padding"

        />

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



    <include

        layout="@layout/keyguard_bottom_area"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:id="@+id/header"

    android:layout_width="match_parent"

    style="@style/StatusBarHeader"

    android:layout_height="@dimen/status_bar_header_height"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:paddingStart="@dimen/notification_side_padding"

    android:paddingEnd="@dimen/notification_side_padding"

    android:baselineAligned="false"

    android:elevation="10dp"

    >

packages/SystemUI/res/layout/super_status_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent" >

        <include layout="@layout/status_bar_expanded"

            style="@style/StatusBarExpanded"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone" />

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

packages/SystemUI/res/values-sw600dp/styles.xml

+7 −2
Original line number Diff line number Diff line
@@ -19,9 +19,14 @@ 
        <item name="android:layout_width">480dp</item>

    </style>



    <style name="StatusBarExpanded">

    <style name="NotificationsQuickSettings">

        <item name="android:layout_width">@dimen/notification_panel_width</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">start|top</item>

        <item name="android:layout_gravity">top|center_horizontal</item>

    </style>



    <style name="StatusBarHeader">

        <item name="android:layout_width">@dimen/notification_panel_width</item>

        <item name="android:layout_gravity">center_horizontal</item>

    </style>

</resources>

packages/SystemUI/res/values/styles.xml

+4 −2
Original line number Diff line number Diff line
@@ -171,10 +171,12 @@ 


    <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault" />



    <style name="StatusBarExpanded">

    <style name="NotificationsQuickSettings">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">start|top</item>

    </style>



    <style name="StatusBarHeader">

        <item name="android:layout_width">match_parent</item>

    </style>

</resources>