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

Commit db33f4ff authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Remove divider between QSFooter and media" into sc-dev

parents dc8bad21 8ed244ea

packages/SystemUI/res-keyguard/layout/qs_media_divider.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:layout_width="match_parent"

    android:layout_height="1dp"

    android:layout_marginBottom="16dp"

    android:background="@color/media_divider">

</View>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_footer_impl.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_height="@dimen/qs_footer_height"

    android:layout_marginStart="@dimen/qs_footer_margin"

    android:layout_marginEnd="@dimen/qs_footer_margin"

    android:layout_marginBottom="@dimen/qs_footers_margin_bottom"

    android:background="@android:color/transparent"

    android:baselineAligned="false"

    android:clickable="false"

packages/SystemUI/res/layout/qs_panel.xml

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
            android:clipToPadding="false"

            android:clipChildren="false">

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

            <include layout="@layout/qs_media_divider"

                android:id="@+id/divider"/>

        </com.android.systemui.qs.QSPanel>

    </com.android.systemui.qs.NonInterceptingScrollView>

packages/SystemUI/res/layout/quick_settings_security_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:padding="@dimen/qs_footer_padding"

    android:gravity="center_vertical"

    android:layout_gravity="center_vertical|center_horizontal"

    android:layout_marginVertical="@dimen/qs_security_footer_vertical_margin"

    android:layout_marginBottom="@dimen/qs_footers_margin_bottom"

    android:background="@drawable/qs_security_footer_background"

    systemui:singleLineHeight="@dimen/qs_security_footer_single_line_height"

    systemui:textViewId="@id/footer_text"

packages/SystemUI/res/values-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


    <dimen name="qs_security_footer_single_line_height">@*android:dimen/quick_qs_offset_height</dimen>

    <dimen name="qs_footer_padding">14dp</dimen>

    <dimen name="qs_security_footer_vertical_margin">0dp</dimen>

    <dimen name="qs_footers_margin_bottom">0dp</dimen>

    <dimen name="qs_security_footer_background_inset">12dp</dimen>

    <dimen name="qs_security_footer_corner_radius">28dp</dimen>