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

Commit 9d9655a6 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "More QS theme fixes for contrast" into oc-dev 

am: 3ad8c93e

Change-Id: I85e10238ddfceec5cc497868d506e8a3361fb03a
parents cc133c12 3ad8c93e

packages/SystemUI/res/drawable/qs_background_primary.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->

-->

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

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

    <shape>

    <shape>

        <solid android:color="?android:attr/colorPrimaryDark"/>

        <solid android:color="?android:attr/colorPrimary"/>

    </shape>

    </shape>

</inset>
 
</inset>

packages/SystemUI/res/layout/qs_customize_panel.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="0dp"

    android:layout_height="0dp"

    android:orientation="vertical"

    android:orientation="vertical"

    android:elevation="4dp"

    android:background="@drawable/qs_customizer_background"

    android:background="@drawable/qs_customizer_background"

    android:gravity="center_horizontal">

    android:gravity="center_horizontal">

packages/SystemUI/res/layout/qs_detail.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/qs_detail_background"

    android:background="@drawable/qs_detail_background"

    android:elevation="4dp"

    android:clickable="true"

    android:clickable="true"

    android:orientation="vertical"

    android:orientation="vertical"

    android:paddingBottom="8dp"

    android:paddingBottom="8dp"

packages/SystemUI/res/layout/qs_footer.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:id="@+id/header"

    android:id="@+id/header"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="48dp"

    android:layout_height="48dp"

    android:elevation="4dp"

    android:baselineAligned="false"

    android:baselineAligned="false"

    android:clickable="false"

    android:clickable="false"

    android:clipChildren="false"

    android:clipChildren="false"

packages/SystemUI/res/layout/qs_panel.xml

+18 −12
Original line number Original line Diff line number Diff line
@@ -18,17 +18,23 @@ 
    android:id="@+id/quick_settings_container"

    android:id="@+id/quick_settings_container"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

        android:background="@drawable/qs_background_primary"

    android:background="?android:attr/colorPrimaryDark"

    android:clipToPadding="false"

    android:clipToPadding="false"

        android:clipChildren="false"

    android:clipChildren="false">

        android:elevation="4dp">



    <View

        android:id="@+id/qs_background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/qs_background_primary"

        android:elevation="4dp" />





    <com.android.systemui.qs.QSPanel

    <com.android.systemui.qs.QSPanel

        android:id="@+id/quick_settings_panel"

        android:id="@+id/quick_settings_panel"

            android:background="#0000"

        android:layout_marginTop="28dp"

        android:layout_marginTop="28dp"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:layout_marginBottom="48dp" />

        android:layout_marginBottom="48dp" />





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

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