commit 2660a7be456d4e2811b5f3669a343f797b2b1ed5
author bsears <bsears@google.com> Sat Jan 30 00:05:21 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jan 30 00:47:11 2021 +0000
tree b810edfe6cc6acb78aa84374641bf3bafe9edee1
parent 930b66df7722f1e4b00aed59fdcd2fc731f3cc03

Revert "Fix Crash in PIN screen."

This reverts commit aaa0df2fb0357788ad5ad8ff2a5a2a05a7fa9e52.

Reason for revert: We are reverting ag/13435976 in a cherry-pick build and this CL depends on ag/13435976 so reverting this as well to avoid a build break. We will not submit this CL (dev is doing a fix forward) but need the revert CL to do the cherry-pick to the .003 build. Will abandon this CL after we have the cherry-pick build.

Bug: 178412096
Change-Id: I4ab2424e70404ab649e714d104de7e5a5a1a4f2f
(cherry picked from commit 6edacfbae62dab344cf9c980f5204047bd9d678a)

res-keyguard/layout/num_pad_keys.xml

diff --git a/res-keyguard/layout/num_pad_keys.xml b/res-keyguard/layout/num_pad_keys.xml
index 64d351d..8306cb4 100644
--- a/res-keyguard/layout/num_pad_keys.xml
+++ b/res-keyguard/layout/num_pad_keys.xml
@@ -59,23 +59,25 @@
         app:digit="9" />
 
     <!-- Row 4 -->
-    <com.android.keyguard.NumPadButton
+    <ImageButton
         android:id="@+id/delete_button"
         style="@style/NumPadKeyButton.LastRow"
         android:gravity="center_vertical"
         android:src="@drawable/ic_backspace"
         android:clickable="true"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@android:color/white"
+        android:background="@drawable/ripple_drawable"
         android:contentDescription="@string/keyboardview_keycode_delete" />
     <com.android.keyguard.NumPadKey
         android:id="@+id/key0"
         style="@style/NumPadKeyButton.LastRow.MiddleColumn"
         app:digit="0" />
-    <com.android.keyguard.NumPadButton
+    <ImageButton
         android:id="@+id/key_enter"
         style="@style/NumPadKeyButton.LastRow"
         android:src="@drawable/ic_done"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@android:color/white"
+        android:background="@drawable/ripple_drawable"
         android:contentDescription="@string/keyboardview_keycode_enter" />
 </merge>
 

res-keyguard/values/styles.xml

diff --git a/res-keyguard/values/styles.xml b/res-keyguard/values/styles.xml
index 67a6968..ecea30a 100644
--- a/res-keyguard/values/styles.xml
+++ b/res-keyguard/values/styles.xml
@@ -33,9 +33,6 @@
 
     <style name="NumPadKeyButton.LastRow">
         <item name="android:layout_marginBottom">0dp</item>
-        <item name="android:colorControlNormal">?android:attr/colorBackground</item>
-        <item name="android:colorControlHighlight">?android:attr/colorAccent</item>
-        <item name="android:background">@drawable/num_pad_key_background</item>
     </style>
 
     <style name="NumPadKeyButton.LastRow.MiddleColumn">