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

Revert "Workaround for sysui studio builds"

Browse Source 
This reverts commit cbe99e87b7.

Reason for revert: Bootlooping with:

```Caused by: java.lang.UnsupportedOperationException: Failed to resolve attribute at index 0: TypedValue{t=0x2/d=0x112002d a=1 r=0x1060276}
04-16 09:17:42.931  7256  7256 E AndroidRuntime: 	at android.content.res.TypedArray.getColor(TypedArray.java:529)
04-16 09:17:42.931  7256  7256 E AndroidRuntime: 	at com.android.keyguard.NumPadAnimator.reloadColors(NumPadAnimator.java:103)```

Change-Id: If23d3b1ce206029b1b45549edbfb9a0a7823e732
This commit is contained in:
Matt Pietal
2021-04-16 15:05:31 +00:00
parent cbe99e87b7
commit 624459fde3
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/colors.xml
View File

@@ -427,7 +427,4 @@
<!-- Darkest shade of the secondary neutral color used by the system. Black.
This value can be overlaid at runtime by OverlayManager RROs. -->
<color name="system_neutral2_1000">#000000</color>
<!-- Exposes colorSurface in cases where it can't be directly referenced. -->
<color name="surface_above_background">?attr/colorSurface</color>
</resources>

1
core/res/res/values/symbols.xml
View File

@@ -4342,5 +4342,4 @@
<java-symbol type="string" name="view_and_control_notification_content" />
<java-symbol type="layout" name="notification_expand_button"/>
<java-symbol type="color" name="surface_above_background" />
</resources>

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

@@ -17,7 +17,7 @@
*/
-->
<resources>
<resources 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>
@@ -32,7 +32,7 @@
<item name="android:stateListAnimator">@null</item>
</style>
<style name="NumPadKey" parent="Theme.SystemUI">
<item name="android:colorControlNormal">@*android:color/surface_above_background</item>
<item name="android:colorControlNormal">?androidprv:attr/colorSurface</item>
<item name="android:colorControlHighlight">?android:attr/colorAccent</item>
<item name="android:background">@drawable/num_pad_key_background</item>
</style>