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

Commit 5b5cbd13 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Make QS panel peek below the header." into lmp-preview-dev

parents 161920fa f62f2bbc

packages/SystemUI/res/drawable/notification_header_bg.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,13 +19,11 @@ 
    <item android:state_pressed="true">

        <shape>

            <solid android:color="@color/background_color_1_press" />

            <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

    <item>

        <shape>

            <solid android:color="@color/background_color_1" />

            <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_panel_background.xml

+5 −8
Original line number Diff line number Diff line
@@ -13,11 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

        android:insetLeft="@dimen/notification_side_padding"

        android:insetRight="@dimen/notification_side_padding">

    <shape>

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

    <solid android:color="@color/system_primary_color" />

        <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

    <corners

        android:radius="@*android:dimen/notification_quantum_rounded_rect_radius"/>

</shape>
 
</inset>

packages/SystemUI/res/layout/qs_panel.xml

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
<FrameLayout

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

        android:id="@+id/quick_settings_container"

        android:paddingLeft="@dimen/notification_side_padding"

        android:paddingRight="@dimen/notification_side_padding"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/qs_panel_background" >

        android:background="@drawable/qs_panel_background"

        android:elevation="2dp">

    <com.android.systemui.qs.QSPanel

            android:id="@+id/quick_settings_panel"

            android:background="#0000"

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
            android:id="@+id/scroll_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="invisible"

            android:scrollbars="none"

            android:overScrollMode="never"

            android:fillViewport="true">
@@ -71,7 +70,9 @@ 
                    layout="@layout/qs_panel"

                    android:layout_marginTop="@dimen/status_bar_header_height_expanded"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"/>

                    android:layout_height="wrap_content"

                    android:layout_marginLeft="@dimen/notification_side_padding"

                    android:layout_marginRight="@dimen/notification_side_padding"/>



                <!-- A view to reserve space for the collapsed stack -->

                <View
@@ -80,7 +81,6 @@ 
            </LinearLayout>

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





        <com.android.systemui.statusbar.stack.NotificationStackScrollLayout

            android:id="@+id/notification_stack_scroller"

            android:layout_width="match_parent"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:paddingStart="@dimen/notification_side_padding"

    android:paddingEnd="@dimen/notification_side_padding"

    android:baselineAligned="false"

    android:elevation="10dp"

    android:elevation="4dp"

    >



    <View