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

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

Merge changes I1f9a353c,I84a3db27 into udc-dev am: 2873c017 

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



Change-Id: Ib262ae42ae80c19dcccd6935d3b192ea79f7ed08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb7cbb87 2873c017

packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

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

    <item android:color="?androidprv:attr/colorAccentSecondaryVariant"/>

    <item android:color="?androidprv:attr/materialColorSecondaryFixedDim"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:color="?attr/wallpaperTextColorSecondary">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

            <solid android:color="?androidprv:attr/colorAccentTertiary"/>

            <solid android:color="?androidprv:attr/materialColorTertiaryFixed"/>

            <corners android:radius="24dp"/>

        </shape>

    </item>

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

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


<!-- This contains disable eSim buttons shared by sim_pin/sim_puk screens -->

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

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

    android:id="@+id/keyguard_disable_esim"

    style="@style/Keyguard.TextView"

    android:layout_width="wrap_content"
@@ -26,8 +27,8 @@ 
    android:background="@drawable/kg_bouncer_secondary_button"

    android:drawablePadding="10dp"

    android:drawableStart="@drawable/ic_no_sim"

    android:drawableTint="?android:attr/textColorPrimary"

    android:drawableTint="?androidprv:attr/materialColorOnSurface"

    android:text="@string/disable_carrier_button_text"

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

    android:textColor="?androidprv:attr/materialColorOnSurface"

    android:textSize="@dimen/kg_status_line_font_size"

    android:visibility="gone" />

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

+3 −2
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ 


<com.android.keyguard.KeyguardSecurityContainer

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

    xmlns:androidprv="http://schemas.android.com/apk/res-auto"

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

    android:id="@+id/keyguard_security_container"

    android:background="?androidprv:attr/materialColorSurfaceContainer"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingTop="@dimen/keyguard_lock_padding"

    android:paddingTop="@dimen/status_bar_height"

    android:importantForAccessibility="yes"> <!-- Needed because TYPE_WINDOW_STATE_CHANGED is sent

                                                  from this view when bouncer is shown -->

    <com.android.keyguard.KeyguardSecurityViewFlipper

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

    </style>

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

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

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

        <item name="android:textSize">16sp</item>

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

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