From 624459fde3b98bb9d24aede6b425eb7f7c985856 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 16 Apr 2021 15:05:31 +0000
Subject: [PATCH] Revert "Workaround for sysui studio builds"

This reverts commit cbe99e87b7ea48ac036a54e9c6d2e41d1354b3ee.

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
---
 core/res/res/values/colors.xml                   | 3 ---
 core/res/res/values/symbols.xml                  | 1 -
 packages/SystemUI/res-keyguard/values/styles.xml | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 3cc83c1362b05..0213c60e9f60c 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -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>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index c4fa3bd31af7f..d69c7f8f95876 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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>
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index 7ac3020ae886f..0fef9f15c3738 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -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>