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

Commit 4da6649f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Change colors in QSSecurityFooter" into rvc-dev am: 6a033d23... 

Merge "Merge "Change colors in QSSecurityFooter" into rvc-dev am: 6a033d23 am: e0dbdc67 am: 872efcfa" into rvc-qpr-dev-plus-aosp
parents 4db6a2e6 e718f596

packages/SystemUI/res/layout/quick_settings_footer.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:paddingStart="@dimen/qs_footer_padding_start"

    android:paddingEnd="@dimen/qs_footer_padding_end"

    android:gravity="center_vertical"

    android:background="?android:attr/colorPrimary" >

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



    <TextView

        android:id="@+id/footer_text"
@@ -32,7 +32,7 @@ 
        android:gravity="start"

        android:layout_weight="1"

        android:textAppearance="@style/TextAppearance.QS.TileLabel"

        android:textColor="?android:attr/textColorSecondary"/>

        style="@style/qs_security_footer"/>



    <ImageView

        android:id="@+id/footer_icon"
@@ -40,6 +40,6 @@ 
        android:layout_height="@dimen/qs_footer_icon_size"

        android:contentDescription="@null"

        android:src="@drawable/ic_info_outline"

        android:tint="?android:attr/textColorSecondary"/>

        style="@style/qs_security_footer"/>



</LinearLayout>

packages/SystemUI/res/values-night/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -29,4 +29,9 @@ 
        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="qs_security_footer" parent="@style/qs_theme">

        <item name="android:textColor">#B3FFFFFF</item> <!-- 70% white -->

        <item name="android:tint">#FFFFFFFF</item>

    </style>



</resources>

packages/SystemUI/res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -387,6 +387,11 @@ 
        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

    </style>



    <style name="qs_security_footer" parent="@style/qs_theme">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:tint">?android:attr/textColorSecondary</item>

    </style>



    <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:colorAccent">@color/remote_input_accent</item>

    </style>