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

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

am fe9aa0dd: Merge "Fix measure performance of whole status bar window." 

* commit 'fe9aa0dd44686f208b3f7c4fce5bc93b58558e35':
  Fix measure performance of whole status bar window.
parents 9f1c7c9d a082c9ac

packages/SystemUI/res/layout/heads_up.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
<com.android.systemui.statusbar.policy.HeadsUpNotificationView

<com.android.systemui.statusbar.policy.HeadsUpNotificationView

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

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

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="@dimen/notification_panel_width"

        android:layout_width="match_parent"

        android:id="@+id/content_holder"

        android:id="@+id/content_holder"

        android:background="@drawable/notification_panel_bg"

        android:background="@drawable/notification_panel_bg"

        />
 
        />
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

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

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

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

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

    android:id="@+id/notification_panel"

    android:id="@+id/notification_panel"

    android:layout_width="0dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    >

    >
@@ -61,7 +61,7 @@ 
    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

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

        android:id="@+id/notification_container_parent"

        android:id="@+id/notification_container_parent"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:clipChildren="false">

        android:clipChildren="false">

packages/SystemUI/res/layout/super_status_bar.xml

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

        android:layout_width="match_parent"

        android:layout_height="match_parent" >

        android:layout_height="match_parent" >

        <include layout="@layout/status_bar_expanded"

        <include layout="@layout/status_bar_expanded"

            android:layout_width="@dimen/notification_panel_width"

            style="@style/StatusBarExpanded" />

            android:layout_height="match_parent"

            android:layout_gravity="start|top" />

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

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





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

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -18,4 +18,10 @@ 
    <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer">

    <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer">

        <item name="android:layout_width">480dp</item>

        <item name="android:layout_width">480dp</item>

    </style>

    </style>



    <style name="StatusBarExpanded">

        <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>

    </style>

</resources>
 
</resources>

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -196,9 +196,6 @@ 
    <!-- Quick Settings CA Cert Warning tile geometry: gap between icon and text -->

    <!-- Quick Settings CA Cert Warning tile geometry: gap between icon and text -->

    <dimen name="qs_cawarn_tile_margin_below_icon">3dp</dimen>

    <dimen name="qs_cawarn_tile_margin_below_icon">3dp</dimen>





    <!-- The width of the notification panel window: match_parent below sw600dp -->

    <dimen name="notification_panel_width">-1dp</dimen>



    <!-- used by DessertCase -->

    <!-- used by DessertCase -->

    <dimen name="dessert_case_cell_size">192dp</dimen>

    <dimen name="dessert_case_cell_size">192dp</dimen>