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

Commit a8066dd6 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am ffc731d5: Merge "Properly crop header underneath panel close handle." into jb-dev

* commit 'ffc731d5':
  Properly crop header underneath panel close handle.
parents 9de7b9c2 ffc731d5
Loading
Loading
Loading
Loading
+22 −18
Original line number Diff line number Diff line
@@ -23,16 +23,21 @@
    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
    android:id="@+id/notification_panel"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:layout_height="match_parent"
    android:background="@drawable/notification_panel_bg"
    android:paddingTop="@dimen/notification_panel_padding_top"
    android:layout_marginLeft="@dimen/notification_panel_margin_left"
    >

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginBottom="@dimen/close_handle_underlap"
        >

        <include layout="@layout/status_bar_expanded_header"
            android:layout_width="match_parent"
        android:layout_height="wrap_content"
            android:layout_height="48dp"
            />
     
        <ScrollView
@@ -42,7 +47,6 @@
            android:fadingEdge="none"
            android:overScrollMode="ifContentScrolls"
            android:layout_marginTop="@dimen/notification_panel_header_height"
        android:layout_marginBottom="@dimen/close_handle_underlap"
            >
            <com.android.systemui.statusbar.policy.NotificationRowLayout
                android:id="@+id/latestItems"
@@ -51,6 +55,7 @@
                systemui:rowHeight="@dimen/notification_row_min_height"
                />
        </ScrollView>
    </FrameLayout>

    <com.android.systemui.statusbar.phone.CloseDragHandle android:id="@+id/close"
        android:layout_width="match_parent"
@@ -67,5 +72,4 @@
            />

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

</FrameLayout><!-- end of sliding panel -->