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

Commit b8f633e6 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Bouncer: Change color of emergency button text" into tm-dev am: 7bdff4f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17141302

Change-Id: I99341df77d6e1f2331dfa73b6b89b8f072abe6b8
parents 875ca05e 7bdff4f2

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

+3 −2
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 
*/

-->



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

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

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

    <!-- Keyguard PIN pad styles -->

    <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

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

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

        <item name="android:textSize">14dp</item>

        <item name="android:background">@drawable/kg_emergency_button_background</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

packages/SystemUI/src/com/android/keyguard/EmergencyButton.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class EmergencyButton extends Button { 
     **/

    public void reloadColors() {

        int color = Utils.getColorAttrDefaultColor(getContext(),

                android.R.attr.textColorPrimaryInverse);

                com.android.internal.R.attr.textColorOnAccent);

        setTextColor(color);

        setBackground(getContext()

                .getDrawable(com.android.systemui.R.drawable.kg_emergency_button_background));