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

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

Merge "Fix visual styles in QSCustomizer and CarrierText"

parents 65ccc9b1 f80234c1

packages/SystemUI/res/drawable/qs_customize_tile_decoration.xml

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
<!--

     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

       android:color="@color/qs_customize_decoration"/>
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_customizer_background_primary.xml

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

-->

<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/colorPrimary"/>

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

        <corners android:radius="?android:attr/dialogCornerRadius" />

        <corners android:radius="?android:attr/dialogCornerRadius" />

    </shape>

    </shape>

</inset>
 
</inset>

packages/SystemUI/res/drawable/qs_customizer_toolbar.xml

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

-->

<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/colorSecondary"/>

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

        <corners

        <corners

            android:topLeftRadius="?android:attr/dialogCornerRadius"

            android:topLeftRadius="?android:attr/dialogCornerRadius"

            android:topRightRadius="?android:attr/dialogCornerRadius" />

            android:topRightRadius="?android:attr/dialogCornerRadius" />

packages/SystemUI/res/layout/keyguard_status_bar.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ 
        android:gravity="center_vertical"

        android:gravity="center_vertical"

        android:ellipsize="marquee"

        android:ellipsize="marquee"

        android:textDirection="locale"

        android:textDirection="locale"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:textColor="?attr/wallpaperTextColorSecondary"

        android:textColor="?attr/wallpaperTextColorSecondary"

        android:singleLine="true"

        android:singleLine="true"

        systemui:showMissingSim="true"

        systemui:showMissingSim="true"

packages/SystemUI/res/layout/qs_customize_divider.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -24,5 +24,4 @@ 
    android:paddingTop="20dp"

    android:paddingTop="20dp"

    android:paddingBottom="13dp"

    android:paddingBottom="13dp"

    android:textAppearance="@style/TextAppearance.QSEdit.Headers"

    android:textAppearance="@style/TextAppearance.QSEdit.Headers"

    android:textColor="?android:attr/colorAccent"

    android:text="@string/drag_to_add_tiles" />
 
    android:text="@string/drag_to_add_tiles" />