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

Commit 32e27a9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing studio build due to androidprv" into sc-v2-dev am: 13e33418

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

Change-Id: I544523b80fdb64e19f0dd9af93b3ecd68c422cc5
parents 866b068b 13e33418
Loading
Loading
Loading
Loading
+5 −0
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"/>
</selector>
 No newline at end of file
+3 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@
*/
-->

<resources
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<resources xmlns:android="http://schemas.android.com/apk/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>
@@ -59,11 +58,11 @@
        <item name="android:textColor">?android:attr/textColorPrimary</item>
    </style>
    <style name="NumPadKey.Delete">
        <item name="android:colorControlNormal">?androidprv:attr/colorAccentSecondaryVariant</item>
        <item name="android:colorControlNormal">@color/numpad_key_color_secondary</item>
        <item name="android:src">@drawable/ic_backspace_24dp</item>
    </style>
    <style name="NumPadKey.Enter">
        <item name="android:colorControlNormal">?androidprv:attr/colorAccentSecondaryVariant</item>
        <item name="android:colorControlNormal">@color/numpad_key_color_secondary</item>
        <item name="android:src">@drawable/ic_keyboard_tab_36dp</item>
    </style>
    <style name="Widget.TextView.NumPadKey.Klondike"