Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I544523b80fdb64e19f0dd9af93b3ecd68c422cc5
This commit is contained in:
TreeHugger Robot
2021-10-01 12:04:57 +00:00
committed by Automerger Merge Worker
parent 866b068b9d 13e3341864
commit 32e27a9b45
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res-keyguard/color/numpad_key_color_secondary.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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>

7
packages/SystemUI/res-keyguard/values/styles.xml
View File

@@ -17,8 +17,7 @@
*/ */
--> -->
<resources <resources xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<!-- Keyguard PIN pad styles --> <!-- Keyguard PIN pad styles -->
<style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView"> <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">
<item name="android:textSize">@dimen/kg_status_line_font_size</item> <item name="android:textSize">@dimen/kg_status_line_font_size</item>
@@ -59,11 +58,11 @@
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>
<style name="NumPadKey.Delete"> <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> <item name="android:src">@drawable/ic_backspace_24dp</item>
</style> </style>
<style name="NumPadKey.Enter"> <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> <item name="android:src">@drawable/ic_keyboard_tab_36dp</item>
</style> </style>
<style name="Widget.TextView.NumPadKey.Klondike" <style name="Widget.TextView.NumPadKey.Klondike"